Fixing AudioBuffer params and channel layout bugs

media/renderers/audio_renderer_impl.cc

Index: media/renderers/audio_renderer_impl.cc
diff --git a/media/renderers/audio_renderer_impl.cc b/media/renderers/audio_renderer_impl.cc
index 6689e36c7b4aa303f5da1651849cfe8f4cd92869..2ba77495989f27a5204c8dfe5456126103cdebbe 100644
--- a/media/renderers/audio_renderer_impl.cc
+++ b/media/renderers/audio_renderer_impl.cc
@@ -535,6 +535,15 @@ void AudioRendererImpl::DecodedAudioReady(
       }
     }
   } else {
+    // Check if the buffer we received matches the expected configuration.

[DaleCurtis, 2016/04/07 20:05:04]

Add something like:

// TODO(chcunningham, tguilbert): Figure out if we want to support implicit
// config changes during src=. Doing so requires resampling each individual
// stream which is inefficient when there are many tags in a page.
//
// Note: We explicitly do not check channel layout here to avoid breaking
// weird behavior with multichannel wave files: http://crbug.com/600538.

[tguilbert, 2016/04/07 21:08:50]

Done.

+

[DaleCurtis, 2016/04/07 20:05:04]

No extra line.

[tguilbert, 2016/04/07 21:08:50]

Done.

+    if (!buffer->end_of_stream() &&
+        (buffer->sample_rate() != audio_parameters_.sample_rate() ||
+         buffer->channel_count() !=
+             ChannelLayoutToChannelCount(audio_parameters_.channel_layout()))) {

[DaleCurtis, 2016/04/07 20:05:04]

Just use audio_parameters_.channels() ?

[tguilbert, 2016/04/07 21:08:50]

Oops! You are right. Done.

+      HandleAbortedReadOrDecodeError(PIPELINE_ERROR_DECODE);

[DaleCurtis, 2016/04/07 20:05:04]

Add a MEDIA_LOG in here, something like:

MEDIA_LOG(ERROR, media_log_)
    << "Unsupported midstream configuration change!"
    << " Sample Rate: " << buffer->sample_rate() << " vs "
    << audio_parameters_.sample_rate()
    << ", Channels: " << buffer->channel_count() << " vs "
    << audio_parameters_.channels();

[tguilbert, 2016/04/07 21:08:50]

Done.

+    }
+
     if (!splicer_->AddInput(buffer)) {
       HandleAbortedReadOrDecodeError(AUDIO_RENDERER_ERROR_SPLICE_FAILED);
       return;