diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 20:56:53 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 20:56:53 +0000 |
| commit | eef64cd2c845747d3e7d2b937e6408c21d728d2c (patch) | |
| tree | a18029785ee15c9623fe84a9303be576f96bfa09 /media/base/decoder_buffer.cc | |
| parent | 25491931aeba5ac400db5e4fc88705a74ba47a97 (diff) | |
| download | chromium_src-eef64cd2c845747d3e7d2b937e6408c21d728d2c.zip chromium_src-eef64cd2c845747d3e7d2b937e6408c21d728d2c.tar.gz chromium_src-eef64cd2c845747d3e7d2b937e6408c21d728d2c.tar.bz2 | |
Replace av_malloc with AlignedAlloc for memory allocation in DecoderBuffer.
BUG=150920,145551
TEST=media_unittests
Review URL: https://chromiumcodereview.appspot.com/10949029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157836 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/decoder_buffer.cc')
| -rw-r--r-- | media/base/decoder_buffer.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc index 527fb65..3c298a4 100644 --- a/media/base/decoder_buffer.cc +++ b/media/base/decoder_buffer.cc @@ -6,8 +6,9 @@ #include "base/logging.h" #include "media/base/decrypt_config.h" + #if !defined(OS_ANDROID) -#include "media/ffmpeg/ffmpeg_common.h" +#include "base/memory/aligned_memory.h" #endif namespace media { @@ -34,7 +35,7 @@ DecoderBuffer::DecoderBuffer(const uint8* data, int buffer_size) DecoderBuffer::~DecoderBuffer() { #if !defined(OS_ANDROID) - av_free(data_); + base::AlignedFree(data_); #else delete[] data_; #endif @@ -43,12 +44,9 @@ DecoderBuffer::~DecoderBuffer() { 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 |