Encrypted Media: Update config/state after config changed in DecryptingAudioDecoder.

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 176 matching lines @@
   DCHECK(reset_cb_.is_null());  // No Reset() before initialization finished.
   DCHECK(read_cb_.is_null());  // No Read() before initialization finished.
 
   if (!success) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     state_ = kDecodeFinished;
     return;
   }
 
   // Success!
-  const AudioDecoderConfig& config = demuxer_stream_->audio_decoder_config();
-  bits_per_channel_ = config.bits_per_channel();
-  channel_layout_ = config.channel_layout();
-  samples_per_second_ = config.samples_per_second();
-  const int kBitsPerByte = 8;
-  bytes_per_sample_ = ChannelLayoutToChannelCount(channel_layout_) *
-      bits_per_channel_ / kBitsPerByte;
+  SetDecoderConfig();
 
   decryptor_->RegisterNewKeyCB(
       Decryptor::kAudio, BIND_TO_LOOP(&DecryptingAudioDecoder::OnKeyAdded));
 
   state_ = kIdle;
   base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
 }
 
 void DecryptingAudioDecoder::FinishConfigChange(bool success) {
   DVLOG(2) << "FinishConfigChange()";
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingConfigChange) << state_;
   DCHECK(!read_cb_.is_null());
 
   if (!success) {
     base::ResetAndReturn(&read_cb_).Run(kDecodeError, NULL);
     state_ = kDecodeFinished;
     if (!reset_cb_.is_null())
       base::ResetAndReturn(&reset_cb_).Run();
     return;
   }
 
   // Config change succeeded.
+  SetDecoderConfig();
+
   if (!reset_cb_.is_null()) {
     base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
     DoReset();
     return;
   }
 
   state_ = kPendingDemuxerRead;
   ReadFromDemuxerStream();
 }
 
@@ skipping 203 matching lines @@
 
 void DecryptingAudioDecoder::DoReset() {
   DCHECK(init_cb_.is_null());
   DCHECK(read_cb_.is_null());
   output_timestamp_base_ = kNoTimestamp();
   total_samples_decoded_ = 0;
   state_ = kIdle;
   base::ResetAndReturn(&reset_cb_).Run();
 }
 
+void DecryptingAudioDecoder::SetDecoderConfig() {

[ddorwin, 2013/01/11 05:19:57]

I think it would be better to pass in the thing we're setting
(AudioDecoderConfig). Otherwise, it's not obvious what the function does without
looking at it.

+  const AudioDecoderConfig& config = demuxer_stream_->audio_decoder_config();
+  bits_per_channel_ = config.bits_per_channel();
+  channel_layout_ = config.channel_layout();
+  samples_per_second_ = config.samples_per_second();
+  const int kBitsPerByte = 8;
+  bytes_per_sample_ = ChannelLayoutToChannelCount(channel_layout_) *
+      bits_per_channel_ / kBitsPerByte;
+  output_timestamp_base_ = kNoTimestamp();
+  total_samples_decoded_ = 0;
+}
+
 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<Buffer>& frame = *iter;
 
     DCHECK(!frame->IsEndOfStream()) << "EOS frame returned.";
@@ skipping 24 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