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

media/base/decoder_buffer.h

Index: media/base/decoder_buffer.h
diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h
index d0c57ce07f53afdc4a97435cce0e38b9d358d749..b57510b0f71f330361823da89537e7d2ea7da1ef 100644
--- a/media/base/decoder_buffer.h
+++ b/media/base/decoder_buffer.h
@@ -13,6 +13,7 @@
 #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"
@@ -20,6 +21,12 @@
 
 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 {
@@ -62,7 +69,7 @@ class MEDIA_EXPORT DecoderBuffer : public Buffer {
 
  private:
   int buffer_size_;
-  uint8* data_;
+  scoped_ptr<uint8[], AlignedFreeDeleter> data_;
   scoped_ptr<DecryptConfig> decrypt_config_;
 
   // Constructor helper method for memory allocations.