Replace av_malloc with AlignedAlloc for memory allocation in DecoderBuffer.

media/base/decoder_buffer.h

 // 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.
 
 // A specialized buffer for interfacing with audio / video decoders.
 //
 // Specifically ensures that data is aligned and padded as necessary by the
 // underlying decoding framework.  On desktop platforms this means memory is
 // allocated using FFmpeg with particular alignment and padding requirements.
 //
 // Also includes decoder specific functionality for decryption.
 
 #ifndef MEDIA_BASE_DECODER_BUFFER_H_
 #define MEDIA_BASE_DECODER_BUFFER_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffers.h"
 #include "media/base/decrypt_config.h"
 
 namespace media {
 
 class MEDIA_EXPORT DecoderBuffer : public Buffer {
  public:
+  enum {
+    kPaddingSize = 16,
+#if defined(ARCH_CPU_ARM_FAMILY)

[DaleCurtis, 2012/09/20 03:36:13]

Probably need to include "build/build_config.h" for this.

[xhwang, 2012/09/20 04:16:25]

Done.

+    kAlignmentSize = 16
+#else
+    kAlignmentSize = 32
+#endif
+  };
+
   // Allocates buffer of size |buffer_size| >= 0.  Buffer will be padded and
   // aligned as necessary.
   explicit DecoderBuffer(int buffer_size);
 
   // Create a DecoderBuffer whose |data_| is copied from |data|.  Buffer will be
   // padded and aligned as necessary.  |data| must not be NULL and |size| >= 0.
   static scoped_refptr<DecoderBuffer> CopyFrom(const uint8* data, int size);
 
   // Create a DecoderBuffer indicating we've reached end of stream.  GetData()
   // and GetWritableData() will return NULL and GetDataSize() will return 0.
@@ skipping 23 matching lines @@
 
   // Constructor helper method for memory allocations.
   void Initialize();
 
   DISALLOW_COPY_AND_ASSIGN(DecoderBuffer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECODER_BUFFER_H_