Use FFmpeg default padding when allocating audio buffers.

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 69 matching lines @@
 
   if (s->sample_rate != frame->sample_rate) {
     DLOG(ERROR) << "AVCodecContext and AVFrame disagree on sample rate."
                 << s->sample_rate << " vs " << frame->sample_rate;
     return AVERROR(EINVAL);
   }
 
   // Determine how big the buffer should be and allocate it. FFmpeg may adjust
   // 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,
-                                 AudioBuffer::kChannelAlignment);
+  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);
   scoped_refptr<AudioBuffer> buffer = AudioBuffer::CreateBuffer(
       sample_format,
       ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels),
       channels,
       s->sample_rate,
@@ skipping 325 matching lines @@
   return true;
 }
 
 void FFmpegAudioDecoder::ResetTimestampState() {
   discard_helper_.reset(new AudioDiscardHelper(config_.samples_per_second(),
                                                config_.codec_delay()));
   discard_helper_->Reset(config_.codec_delay());
 }
 
 }  // namespace media