Use scoped_ptr<> and deleter for media::DecoderBuffer::data_.

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/aligned_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "media/base/buffers.h"
 #include "media/base/decrypt_config.h"
 
 namespace media {
 
+struct AlignedFreeDeleter {

[DaleCurtis, 2012/12/21 01:11:44]

Just use ScopedPtrAlignedFree from base/memory/aligned_memory.h ?

[xhwang, 2012/12/21 01:31:05]

Indeed. Thanks for pointing that out.

+  inline void operator()(void* ptr) const {
+    base::AlignedFree(ptr);
+  }
+};
+
 class MEDIA_EXPORT DecoderBuffer : public Buffer {
  public:
   enum {
     kPaddingSize = 16,
 #if defined(ARCH_CPU_ARM_FAMILY)
     kAlignmentSize = 16
 #else
     kAlignmentSize = 32
 #endif
   };
@@ skipping 22 matching lines @@
 
  protected:
   // Allocates a buffer of size |size| >= 0 and copies |data| into it.  Buffer
   // will be padded and aligned as necessary.  If |data| is NULL then |data_| is
   // set to NULL and |buffer_size_| to 0.
   DecoderBuffer(const uint8* data, int size);
   virtual ~DecoderBuffer();
 
  private:
   int buffer_size_;
-  uint8* data_;
+  scoped_ptr<uint8[], AlignedFreeDeleter> data_;
   scoped_ptr<DecryptConfig> decrypt_config_;
 
   // Constructor helper method for memory allocations.
   void Initialize();
 
   DISALLOW_COPY_AND_ASSIGN(DecoderBuffer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECODER_BUFFER_H_