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

Unified Diff: media/filters/decrypting_audio_decoder.cc

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_audio_decoder.cc
diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc
index 822bf2b90bb9880aa6f40314b7117faf2fa3e4ae..42d7a1b18241a6a1d6fd313aa9fd152db30eab32 100644
--- a/media/filters/decrypting_audio_decoder.cc
+++ b/media/filters/decrypting_audio_decoder.cc
@@ -36,10 +36,10 @@ static inline bool IsOutOfSync(const base::TimeDelta& timestamp_1,
DecryptingAudioDecoder::DecryptingAudioDecoder(
const scoped_refptr<base::MessageLoopProxy>& message_loop,
- const RequestDecryptorNotificationCB& request_decryptor_notification_cb)
+ const SetDecryptorReadyCB& set_decryptor_ready_cb)
: message_loop_(message_loop),
state_(kUninitialized),
- request_decryptor_notification_cb_(request_decryptor_notification_cb),
+ set_decryptor_ready_cb_(set_decryptor_ready_cb),
decryptor_(NULL),
key_added_while_decode_pending_(false),
bits_per_channel_(0),
@@ -153,7 +153,7 @@ void DecryptingAudioDecoder::DoInitialize(
init_cb_ = status_cb;
state_ = kDecryptorRequested;
- request_decryptor_notification_cb_.Run(
+ set_decryptor_ready_cb_.Run(
BIND_TO_LOOP(&DecryptingAudioDecoder::SetDecryptor));
}
@@ -162,9 +162,9 @@ void DecryptingAudioDecoder::SetDecryptor(Decryptor* decryptor) {
DCHECK(message_loop_->BelongsToCurrentThread());
DCHECK_EQ(state_, kDecryptorRequested) << state_;
DCHECK(!init_cb_.is_null());
- DCHECK(!request_decryptor_notification_cb_.is_null());
+ DCHECK(!set_decryptor_ready_cb_.is_null());
- request_decryptor_notification_cb_.Reset();
+ set_decryptor_ready_cb_.Reset();
decryptor_ = decryptor;
scoped_ptr<AudioDecoderConfig> scoped_config(new AudioDecoderConfig());

Powered by Google App Engine
This is Rietveld 408576698