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

Unified Diff: media/filters/decrypting_demuxer_stream.h

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
Index: media/filters/decrypting_demuxer_stream.h
diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h
index 0bb8ae3b9962d8facb44cb0c9548134a11118338..a5ffe7ab4febdfe0651769e7d4341ca973e2caa6 100644
--- a/media/filters/decrypting_demuxer_stream.h
+++ b/media/filters/decrypting_demuxer_stream.h
@@ -40,7 +40,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
~DecryptingDemuxerStream() override;
void Initialize(DemuxerStream* stream,
- const SetCdmReadyCB& set_cdm_ready_cb,
+ CdmContext* cdm_context,
const PipelineStatusCB& status_cb);
// Cancels all pending operations and fires all pending callbacks. If in
@@ -69,17 +69,12 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
// TODO(xhwang): Update this diagram for DecryptingDemuxerStream.
enum State {
kUninitialized = 0,
- kDecryptorRequested,
kIdle,
kPendingDemuxerRead,
kPendingDecrypt,
kWaitingForKey
};
- // 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);
-
// Callback for DemuxerStream::Read().
void DecryptBuffer(DemuxerStream::Status status,
const scoped_refptr<DecoderBuffer>& buffer);
@@ -121,9 +116,6 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
AudioDecoderConfig audio_config_;
VideoDecoderConfig video_config_;
- // Callback to request/cancel CDM ready notification.
- SetCdmReadyCB set_cdm_ready_cb_;
-
Decryptor* decryptor_;
// The buffer returned by the demuxer that needs to be decrypted.

Powered by Google App Engine
This is Rietveld 408576698