Add support for midstream audio configuration changes.

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 24 matching lines @@
 }
 
 DecryptingAudioDecoder::DecryptingAudioDecoder(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     const SetDecryptorReadyCB& set_decryptor_ready_cb)
     : task_runner_(task_runner),
       state_(kUninitialized),
       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),
       weak_factory_(this) {}
 
 void DecryptingAudioDecoder::Initialize(const AudioDecoderConfig& config,
                                         const PipelineStatusCB& status_cb) {
   DVLOG(2) << "Initialize()";
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(decode_cb_.is_null());
   DCHECK(reset_cb_.is_null());
 
   weak_this_ = weak_factory_.GetWeakPtr();
@@ skipping 120 matching lines @@
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
   if (!decode_cb_.is_null())
     base::ResetAndReturn(&decode_cb_).Run(kAborted, NULL);
   if (!reset_cb_.is_null())
     base::ResetAndReturn(&reset_cb_).Run();
 
   state_ = kStopped;
   task_runner_->PostTask(FROM_HERE, closure);
 }
 
-int DecryptingAudioDecoder::bits_per_channel() {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  return bits_per_channel_;
-}
-
-ChannelLayout DecryptingAudioDecoder::channel_layout() {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  return channel_layout_;
-}
-
-int DecryptingAudioDecoder::samples_per_second() {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  return samples_per_second_;
-}
-
 DecryptingAudioDecoder::~DecryptingAudioDecoder() {
   DCHECK(state_ == kUninitialized || state_ == kStopped) << state_;
 }
 
 void DecryptingAudioDecoder::SetDecryptor(Decryptor* decryptor) {
   DVLOG(2) << "SetDecryptor()";
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kDecryptorRequested) << state_;
   DCHECK(!init_cb_.is_null());
   DCHECK(!set_decryptor_ready_cb_.is_null());
@@ skipping 40 matching lines @@
   DCHECK(reset_cb_.is_null());  // No Reset() before initialization finished.
   DCHECK(decode_cb_.is_null());  // No Decode() before initialization finished.
 
   if (!success) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     state_ = kStopped;
     return;
   }
 
   // Success!
-  UpdateDecoderConfig();
+  timestamp_helper_.reset(
+      new AudioTimestampHelper(config_.samples_per_second()));
 
   decryptor_->RegisterNewKeyCB(
       Decryptor::kAudio,
       BindToCurrentLoop(
           base::Bind(&DecryptingAudioDecoder::OnKeyAdded, weak_this_)));
 
   state_ = kIdle;
   base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
 }
 
@@ skipping 99 matching lines @@
 }
 
 void DecryptingAudioDecoder::DoReset() {
   DCHECK(init_cb_.is_null());
   DCHECK(decode_cb_.is_null());
   timestamp_helper_->SetBaseTimestamp(kNoTimestamp());
   state_ = kIdle;
   base::ResetAndReturn(&reset_cb_).Run();
 }
 
-void DecryptingAudioDecoder::UpdateDecoderConfig() {
-  bits_per_channel_ = kSupportedBitsPerChannel;
-  channel_layout_ = config_.channel_layout();
-  samples_per_second_ = config_.samples_per_second();
-  timestamp_helper_.reset(new AudioTimestampHelper(samples_per_second_));
-}
-
 void DecryptingAudioDecoder::EnqueueFrames(
     const Decryptor::AudioBuffers& frames) {
   queued_audio_frames_ = frames;
 
   for (Decryptor::AudioBuffers::iterator iter = queued_audio_frames_.begin();
        iter != queued_audio_frames_.end();
        ++iter) {
     scoped_refptr<AudioBuffer>& frame = *iter;
 
     DCHECK(!frame->end_of_stream()) << "EOS frame returned.";
     DCHECK_GT(frame->frame_count(), 0) << "Empty frame returned.";
 
     base::TimeDelta current_time = timestamp_helper_->GetTimestamp();
     if (IsOutOfSync(current_time, frame->timestamp())) {
       DVLOG(1) << "Timestamp returned by the decoder ("
                << frame->timestamp().InMilliseconds() << " ms)"
                << " does not match the input timestamp and number of samples"
                << " decoded (" << current_time.InMilliseconds() << " ms).";
     }
 
     frame->set_timestamp(current_time);
     frame->set_duration(
         timestamp_helper_->GetFrameDuration(frame->frame_count()));
     timestamp_helper_->AddFrames(frame->frame_count());
   }
 }
 
 }  // namespace media