Add support for midstream audio configuration changes.

media/filters/ffmpeg_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/ffmpeg_audio_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 110 matching lines @@
   frame->buf[0] = av_buffer_create(
       frame->data[0], buffer_size_in_bytes, ReleaseAudioBufferImpl, opaque, 0);
   return 0;
 }
 
 FFmpegAudioDecoder::FFmpegAudioDecoder(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
     : task_runner_(task_runner),
       weak_factory_(this),
       state_(kUninitialized),
-      bytes_per_channel_(0),
-      channel_layout_(CHANNEL_LAYOUT_NONE),
-      channels_(0),
-      samples_per_second_(0),
       av_sample_format_(0),
       last_input_timestamp_(kNoTimestamp()),
       output_frames_to_drop_(0) {}
 
 FFmpegAudioDecoder::~FFmpegAudioDecoder() {
   DCHECK_EQ(state_, kUninitialized);
   DCHECK(!codec_context_);
   DCHECK(!av_frame_);
 }
 
@@ skipping 46 matching lines @@
 
 scoped_refptr<AudioBuffer> FFmpegAudioDecoder::GetDecodeOutput() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   if (queued_audio_.empty())
     return NULL;
   scoped_refptr<AudioBuffer> out = queued_audio_.front();
   queued_audio_.pop_front();
   return out;
 }
 
-int FFmpegAudioDecoder::bits_per_channel() {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  return bytes_per_channel_ * 8;
-}
-
-ChannelLayout FFmpegAudioDecoder::channel_layout() {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  return channel_layout_;
-}
-
-int FFmpegAudioDecoder::samples_per_second() {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-  return samples_per_second_;
-}
-
 void FFmpegAudioDecoder::Reset(const base::Closure& closure) {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   avcodec_flush_buffers(codec_context_.get());
   state_ = kNormal;
   ResetTimestampState();
   task_runner_->PostTask(FROM_HERE, closure);
 }
 
 void FFmpegAudioDecoder::Stop(const base::Closure& closure) {
@@ skipping 54 matching lines @@
     decode_cb.Run(kDecodeError, NULL);
     return;
   }
 
   if (!buffer->end_of_stream()) {
     if (last_input_timestamp_ == kNoTimestamp() &&
         codec_context_->codec_id == AV_CODEC_ID_VORBIS &&
         buffer->timestamp() < base::TimeDelta()) {
       // Dropping frames for negative timestamps as outlined in section A.2
       // in the Vorbis spec. http://xiph.org/vorbis/doc/Vorbis_I_spec.html
-      output_frames_to_drop_ = floor(
-          0.5 + -buffer->timestamp().InSecondsF() * samples_per_second_);
+      output_frames_to_drop_ = floor(0.5 + -buffer->timestamp().InSecondsF() *
+                                               config_.samples_per_second());
     } else {
       if (last_input_timestamp_ != kNoTimestamp() &&
           buffer->timestamp() < last_input_timestamp_) {
         const base::TimeDelta diff =
             buffer->timestamp() - last_input_timestamp_;
         DLOG(WARNING)
             << "Input timestamps are not monotonically increasing! "
             << " ts " << buffer->timestamp().InMicroseconds() << " us"
             << " diff " << diff.InMicroseconds() << " us";
       }
@@ skipping 84 matching lines @@
       } else {
         output_timestamp_helper_->SetBaseTimestamp(buffer->timestamp());
       }
     }
 
     scoped_refptr<AudioBuffer> output;
     int decoded_frames = 0;
     int original_frames = 0;
     int channels = DetermineChannels(av_frame_.get());
     if (frame_decoded) {
-
-      // TODO(rileya) Remove this check once we properly support midstream audio
-      // config changes.
       if (av_frame_->sample_rate != config_.samples_per_second() ||

[rileya (GONE FROM CHROMIUM), 2014/03/07 01:19:29]

jk on the TODO, we still shouldn't expect to see changes here...

-          channels != channels_ ||
+          channels != ChannelLayoutToChannelCount(config_.channel_layout()) ||

[DaleCurtis, 2014/03/07 02:00:10]

Store channels_ ?  No need to recompute every packet.

           av_frame_->format != av_sample_format_) {
         DLOG(ERROR) << "Unsupported midstream configuration change!"
                     << " Sample Rate: " << av_frame_->sample_rate << " vs "
-                    << samples_per_second_
+                    << config_.samples_per_second()
                     << ", Channels: " << channels << " vs "
-                    << channels_
+                    << ChannelLayoutToChannelCount(config_.channel_layout())
                     << ", Sample Format: " << av_frame_->format << " vs "
                     << av_sample_format_;
 
         // This is an unrecoverable error, so bail out.
         queued_audio_.clear();
         av_frame_unref(av_frame_.get());
         return false;
       }
 
       // Get the AudioBuffer that the data was decoded into. Adjust the number
       // of frames, in case fewer than requested were actually decoded.
       output = reinterpret_cast<AudioBuffer*>(
           av_buffer_get_opaque(av_frame_->buf[0]));
 
-      DCHECK_EQ(channels_, output->channel_count());
+      DCHECK_EQ(ChannelLayoutToChannelCount(config_.channel_layout()),
+                output->channel_count());
       original_frames = av_frame_->nb_samples;
       int unread_frames = output->frame_count() - original_frames;
       DCHECK_GE(unread_frames, 0);
       if (unread_frames > 0)
         output->TrimEnd(unread_frames);
 
       // If there are frames to drop, get rid of as many as we can.
       if (output_frames_to_drop_ > 0) {
         int drop = std::min(output->frame_count(), output_frames_to_drop_);
         output->TrimStart(drop);
@@ skipping 42 matching lines @@
                 << " bits per channel: " << config_.bits_per_channel()
                 << " samples per second: " << config_.samples_per_second();
     return false;
   }
 
   if (config_.is_encrypted()) {
     DLOG(ERROR) << "Encrypted audio stream not supported";
     return false;
   }
 
-  // TODO(rileya) Remove this check once we properly support midstream audio
-  // config changes.
-  if (codec_context_.get() &&
-      (bytes_per_channel_ != config_.bytes_per_channel() ||
-       channel_layout_ != config_.channel_layout() ||
-       samples_per_second_ != config_.samples_per_second())) {
-    DVLOG(1) << "Unsupported config change :";
-    DVLOG(1) << "\tbytes_per_channel : " << bytes_per_channel_
-             << " -> " << config_.bytes_per_channel();
-    DVLOG(1) << "\tchannel_layout : " << channel_layout_
-             << " -> " << config_.channel_layout();
-    DVLOG(1) << "\tsample_rate : " << samples_per_second_
-             << " -> " << config_.samples_per_second();
-    return false;
-  }
-
   // Release existing decoder resources if necessary.
   ReleaseFFmpegResources();
 
   // Initialize AVCodecContext structure.
   codec_context_.reset(avcodec_alloc_context3(NULL));
   AudioDecoderConfigToAVCodecContext(config_, codec_context_.get());
 
   codec_context_->opaque = this;
   codec_context_->get_buffer2 = GetAudioBuffer;
   codec_context_->refcounted_frames = 1;
 
   AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
   if (!codec || avcodec_open2(codec_context_.get(), codec, NULL) < 0) {
     DLOG(ERROR) << "Could not initialize audio decoder: "
                 << codec_context_->codec_id;
     ReleaseFFmpegResources();
     state_ = kUninitialized;
     return false;
   }
 
   // Success!
   av_frame_.reset(av_frame_alloc());
-  channel_layout_ = config_.channel_layout();
-  samples_per_second_ = config_.samples_per_second();
   output_timestamp_helper_.reset(
       new AudioTimestampHelper(config_.samples_per_second()));
 
-  // Store initial values to guard against midstream configuration changes.
-  channels_ = codec_context_->channels;
-  if (channels_ != ChannelLayoutToChannelCount(channel_layout_)) {
+  av_sample_format_ = codec_context_->sample_fmt;
+
+  if (codec_context_->channels !=
+      ChannelLayoutToChannelCount(config_.channel_layout())) {
     DLOG(ERROR) << "Audio configuration specified "
-                << ChannelLayoutToChannelCount(channel_layout_)
+                << ChannelLayoutToChannelCount(config_.channel_layout())
                 << " channels, but FFmpeg thinks the file contains "
-                << channels_ << " channels";
+                << codec_context_->channels << " channels";
     return false;
   }
-  av_sample_format_ = codec_context_->sample_fmt;
-  sample_format_ = AVSampleFormatToSampleFormat(
-      static_cast<AVSampleFormat>(av_sample_format_));
-  bytes_per_channel_ = SampleFormatToBytesPerChannel(sample_format_);
-
   return true;
 }
 
 void FFmpegAudioDecoder::ResetTimestampState() {
   output_timestamp_helper_->SetBaseTimestamp(kNoTimestamp());
   last_input_timestamp_ = kNoTimestamp();
   output_frames_to_drop_ = 0;
 }
 
 }  // namespace media