Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(499)

Unified Diff: media/filters/gpu_video_decoder.h

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and fix compile errors Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/filters/gpu_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/gpu_video_decoder.h
diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h
index 3223552b3ab09066fa1cc5ed46d4df9379e44b98..1c86862fc7d5bca439975b1f25f3adb4dd68173d 100644
--- a/media/filters/gpu_video_decoder.h
+++ b/media/filters/gpu_video_decoder.h
@@ -51,7 +51,7 @@ class MEDIA_EXPORT GpuVideoDecoder
std::string GetDisplayName() const override;
void Initialize(const VideoDecoderConfig& config,
bool low_delay,
- const SetCdmReadyCB& set_cdm_ready_cb,
+ CdmContext* cdm_context,
const InitCB& init_cb,
const OutputCB& output_cb) override;
void Decode(const scoped_refptr<DecoderBuffer>& buffer,
@@ -107,10 +107,6 @@ class MEDIA_EXPORT GpuVideoDecoder
typedef std::map<int32_t, PictureBuffer> PictureBufferMap;
- // Callback to set CDM. |cdm_attached_cb| is called when the decryptor in the
- // CDM has been completely attached to the pipeline.
- void SetCdm(CdmContext* cdm_context, const CdmAttachedCB& cdm_attached_cb);
-
void DeliverFrame(const scoped_refptr<VideoFrame>& frame);
// Static method is to allow it to run even after GVD is deleted.
@@ -171,10 +167,6 @@ class MEDIA_EXPORT GpuVideoDecoder
VideoDecoderConfig config_;
- // Callback to request/cancel CDM ready notification.
- SetCdmReadyCB set_cdm_ready_cb_;
- CdmAttachedCB cdm_attached_cb_;
-
// Shared-memory buffer pool. Since allocating SHM segments requires a
// round-trip to the browser process, we keep allocation out of the
// steady-state of the decoder.
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/filters/gpu_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698