Fix unsupported audio channel layout

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 <stdint.h>
 
 #include "base/callback_helpers.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 77 matching lines @@
   // how big each channel data is in order to meet the alignment policy, so
   // we need to take this into consideration.
   int buffer_size_in_bytes = av_samples_get_buffer_size(
       &frame->linesize[0], channels, frame->nb_samples, format,
       0 /* align, use ffmpeg default */);
   // Check for errors from av_samples_get_buffer_size().
   if (buffer_size_in_bytes < 0)
     return buffer_size_in_bytes;
   int frames_required = buffer_size_in_bytes / bytes_per_channel / channels;
   DCHECK_GE(frames_required, frame->nb_samples);
+
+  ChannelLayout channel_layout =
+      ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels);
+
+  if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) {
+    DLOG(ERROR) << "Unsupported channel layout.";
+    return AVERROR(EINVAL);
+  }
+
   scoped_refptr<AudioBuffer> buffer = AudioBuffer::CreateBuffer(
-      sample_format,
-      ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels),
-      channels,
-      s->sample_rate,
-      frames_required);
+      sample_format, channel_layout, channels, s->sample_rate, frames_required);
 
   // Initialize the data[] and extended_data[] fields to point into the memory
   // allocated for AudioBuffer. |number_of_planes| will be 1 for interleaved
   // audio and equal to |channels| for planar audio.
   int number_of_planes = buffer->channel_data().size();
   if (number_of_planes <= AV_NUM_DATA_POINTERS) {
     DCHECK_EQ(frame->extended_data, frame->data);
     for (int i = 0; i < number_of_planes; ++i)
       frame->data[i] = buffer->channel_data()[i];
   } else {
@@ skipping 321 matching lines @@
   // Opus codec delay is handled by ffmpeg.
   const int codec_delay =
       config_.codec() == kCodecOpus ? 0 : config_.codec_delay();
   discard_helper_.reset(
       new AudioDiscardHelper(config_.samples_per_second(), codec_delay,
                              config_.codec() == kCodecVorbis));
   discard_helper_->Reset(codec_delay);
 }
 
 }  // namespace media