Replace av_malloc with AlignedAlloc for memory allocation in DecoderBuffer.

media/base/decoder_buffer.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/base/decoder_buffer.h"
 
 #include "base/logging.h"
+#include "base/memory/aligned_memory.h"

[ddorwin, 2012/09/19 23:59:18]

This does no harm, but is not technically required for Android. Not sure what
the preference is for such situations.

[xhwang, 2012/09/20 01:43:03]

Done.

 #include "media/base/decrypt_config.h"
-#if !defined(OS_ANDROID)
-#include "media/ffmpeg/ffmpeg_common.h"
-#endif
 
 namespace media {
 
 DecoderBuffer::DecoderBuffer(int buffer_size)
     : Buffer(base::TimeDelta(), base::TimeDelta()),
       buffer_size_(buffer_size) {
   Initialize();
 }
 
 DecoderBuffer::DecoderBuffer(const uint8* data, int buffer_size)
     : Buffer(base::TimeDelta(), base::TimeDelta()),
       buffer_size_(buffer_size) {
   // Prevent invalid allocations.  Also used to create end of stream buffers.
   if (!data) {
     buffer_size_ = 0;
     data_ = NULL;
     return;
   }
 
   Initialize();
   memcpy(data_, data, buffer_size_);
 }
 
 DecoderBuffer::~DecoderBuffer() {
 #if !defined(OS_ANDROID)
-  av_free(data_);
+  base::AlignedFree(data_);
 #else
   delete[] data_;
 #endif
 }
 
 void DecoderBuffer::Initialize() {
   DCHECK_GE(buffer_size_, 0);
 #if !defined(OS_ANDROID)
-  // Why FF_INPUT_BUFFER_PADDING_SIZE?  FFmpeg assumes all input buffers are
-  // padded.  Using av_malloc with padding ensures FFmpeg only recieves data
-  // padded and aligned to its specifications.
   data_ = reinterpret_cast<uint8*>(
-      av_malloc(buffer_size_ + FF_INPUT_BUFFER_PADDING_SIZE));
-  memset(data_ + buffer_size_, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+      base::AlignedAlloc(buffer_size_ + kPaddingSize, kAlignmentSize));
+  memset(data_ + buffer_size_, 0, kPaddingSize);
 #else
   data_ = new uint8[buffer_size_];
 #endif
 }
 
 scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data,
                                                      int data_size) {
   DCHECK(data);
   return make_scoped_refptr(new DecoderBuffer(data, data_size));
 }
@@ skipping 16 matching lines @@
 
 const DecryptConfig* DecoderBuffer::GetDecryptConfig() const {
   return decrypt_config_.get();
 }
 
 void DecoderBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) {
   decrypt_config_ = decrypt_config.Pass();
 }
 
 }  // namespace media