Encrypted Media: Support Audio Decrypt-Only.

media/filters/decrypting_audio_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/decrypting_audio_decoder.h"
 
 #include <cstdlib>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 18 matching lines @@
                                const base::TimeDelta& timestamp_2) {
   // Out of sync of 100ms would be pretty noticeable and we should keep any
   // drift below that.
   const int64 kOutOfSyncThresholdInMicroseconds = 100000;
   return std::abs(timestamp_1.InMicroseconds() - timestamp_2.InMicroseconds()) >
          kOutOfSyncThresholdInMicroseconds;
 }
 
 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),
       channel_layout_(CHANNEL_LAYOUT_NONE),
       samples_per_second_(0),
       bytes_per_sample_(0),
       output_timestamp_base_(kNoTimestamp()),
       total_samples_decoded_(0) {
 }
 
@@ skipping 93 matching lines @@
     return;
   }
 
   DCHECK(!demuxer_stream_);
   demuxer_stream_ = stream;
   statistics_cb_ = statistics_cb;
 
   init_cb_ = status_cb;
 
   state_ = kDecryptorRequested;
-  request_decryptor_notification_cb_.Run(
+  set_decryptor_ready_cb_.Run(
       BIND_TO_LOOP(&DecryptingAudioDecoder::SetDecryptor));
 }
 
 void DecryptingAudioDecoder::SetDecryptor(Decryptor* decryptor) {
   DVLOG(2) << "SetDecryptor()";
   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());
   scoped_config->CopyFrom(demuxer_stream_->audio_decoder_config());
 
   state_ = kPendingDecoderInit;
   decryptor_->InitializeAudioDecoder(
       scoped_config.Pass(),
       BIND_TO_LOOP(&DecryptingAudioDecoder::FinishInitialization));
 }
@@ skipping 274 matching lines @@
 
 base::TimeDelta DecryptingAudioDecoder::NumberOfSamplesToDuration(
     int number_of_samples) const {
   DCHECK(samples_per_second_);
   return base::TimeDelta::FromMicroseconds(base::Time::kMicrosecondsPerSecond *
                                            number_of_samples /
                                            samples_per_second_);
 }
 
 }  // namespace media