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

Unified Diff: media/filters/decrypting_demuxer_stream.h

Issue 11492003: Encrypted Media: Support Audio Decrypt-Only. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments mostly resolved (I believe); need to add/update tests if this looks good Created 8 years 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 bb86dec36e553e4923481cfc37263aaf7078c102..73ba1fb5aad34fd4182c8edf5ff5fb9e604e9306 100644
--- a/media/filters/decrypting_demuxer_stream.h
+++ b/media/filters/decrypting_demuxer_stream.h
@@ -24,22 +24,9 @@ class DecoderBuffer;
// that no locks are required for thread safety.
class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
public:
- // Callback to notify decryptor creation.
- typedef base::Callback<void(Decryptor*)> DecryptorNotificationCB;
-
- // Callback to request/cancel decryptor creation notification.
- // Calling this callback with a non-null callback registers decryptor creation
- // notification. When the decryptor is created, notification will be sent
- // through the provided callback.
- // Calling this callback with a null callback cancels previously registered
- // decryptor creation notification. Any previously provided callback will be
- // fired immediately with NULL.
- typedef base::Callback<void(const DecryptorNotificationCB&)>
- RequestDecryptorNotificationCB;
-
DecryptingDemuxerStream(
const scoped_refptr<base::MessageLoopProxy>& message_loop,
- const RequestDecryptorNotificationCB& request_decryptor_notification_cb);
+ const SetDecryptorReadyCB& set_decryptor_ready_cb);
void Initialize(const scoped_refptr<DemuxerStream>& stream,
const PipelineStatusCB& status_cb);
@@ -120,7 +107,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream {
scoped_ptr<VideoDecoderConfig> video_config_;
// Callback to request/cancel decryptor creation notification.
- RequestDecryptorNotificationCB request_decryptor_notification_cb_;
+ SetDecryptorReadyCB set_decryptor_ready_cb_;
Decryptor* decryptor_;

Powered by Google App Engine
This is Rietveld 408576698