| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/logging.h" | 5 #include "base/logging.h" |
| 6 #include "media/base/data_buffer.h" | 6 #include "media/base/data_buffer.h" |
| 7 #include "media/base/decrypt_config.h" | 7 #include "media/base/decrypt_config.h" |
| 8 #if !defined(OS_ANDROID) | 8 #if !defined(OS_ANDROID) |
| 9 #include "media/ffmpeg/ffmpeg_common.h" | 9 #include "media/ffmpeg/ffmpeg_common.h" |
| 10 #endif | 10 #endif |
| 11 | 11 |
| 12 namespace media { | 12 namespace media { |
| 13 | 13 |
| 14 DataBuffer::DataBuffer(scoped_array<uint8> buffer, size_t buffer_size) | 14 DataBuffer::DataBuffer(scoped_array<uint8> buffer, int buffer_size) |
| 15 : data_(buffer.Pass()), | 15 : data_(buffer.Pass()), |
| 16 buffer_size_(buffer_size), | 16 buffer_size_(buffer_size), |
| 17 data_size_(buffer_size) { | 17 data_size_(buffer_size) { |
| 18 } | 18 } |
| 19 | 19 |
| 20 DataBuffer::DataBuffer(size_t buffer_size) | 20 DataBuffer::DataBuffer(int buffer_size) |
| 21 : data_(new uint8[buffer_size]), | 21 : data_(new uint8[buffer_size]), |
| 22 buffer_size_(buffer_size), | 22 buffer_size_(buffer_size), |
| 23 data_size_(0) { | 23 data_size_(0) { |
| 24 CHECK(data_.get()) << "DataBuffer ctor failed to allocate memory"; | 24 CHECK(data_.get()) << "DataBuffer ctor failed to allocate memory"; |
| 25 | 25 |
| 26 // Prevent arbitrary pointers. | 26 // Prevent arbitrary pointers. |
| 27 if (buffer_size == 0) | 27 if (buffer_size == 0) |
| 28 data_.reset(NULL); | 28 data_.reset(NULL); |
| 29 } | 29 } |
| 30 | 30 |
| 31 DataBuffer::~DataBuffer() { | 31 DataBuffer::~DataBuffer() {} |
| 32 } | |
| 33 | 32 |
| 34 scoped_refptr<DataBuffer> DataBuffer::CopyFrom(const uint8* data, | 33 scoped_refptr<DataBuffer> DataBuffer::CopyFrom(const uint8* data, |
| 35 size_t data_size) { | 34 int data_size) { |
| 36 size_t padding_size = 0; | 35 int padding_size = 0; |
| 37 #if !defined(OS_ANDROID) | 36 #if !defined(OS_ANDROID) |
| 38 // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are | 37 // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are |
| 39 // padded with this value. | 38 // padded with this value. |
| 40 padding_size = FF_INPUT_BUFFER_PADDING_SIZE; | 39 padding_size = FF_INPUT_BUFFER_PADDING_SIZE; |
| 41 #endif | 40 #endif |
| 42 | 41 |
| 43 scoped_refptr<DataBuffer> data_buffer( | 42 scoped_refptr<DataBuffer> data_buffer( |
| 44 new DataBuffer(data_size + padding_size)); | 43 new DataBuffer(data_size + padding_size)); |
| 45 memcpy(data_buffer->data_.get(), data, data_size); | 44 memcpy(data_buffer->data_.get(), data, data_size); |
| 46 memset(data_buffer->data_.get() + data_size, 0, padding_size); | 45 memset(data_buffer->data_.get() + data_size, 0, padding_size); |
| 47 data_buffer->SetDataSize(data_size); | 46 data_buffer->SetDataSize(data_size); |
| 48 return data_buffer; | 47 return data_buffer; |
| 49 } | 48 } |
| 50 | 49 |
| 51 const uint8* DataBuffer::GetData() const { | 50 const uint8* DataBuffer::GetData() const { |
| 52 return data_.get(); | 51 return data_.get(); |
| 53 } | 52 } |
| 54 | 53 |
| 55 size_t DataBuffer::GetDataSize() const { | 54 int DataBuffer::GetDataSize() const { |
| 56 return data_size_; | 55 return data_size_; |
| 57 } | 56 } |
| 58 | 57 |
| 59 const DecryptConfig* DataBuffer::GetDecryptConfig() const { | 58 const DecryptConfig* DataBuffer::GetDecryptConfig() const { |
| 60 return decrypt_config_.get(); | 59 return decrypt_config_.get(); |
| 61 } | 60 } |
| 62 | 61 |
| 63 uint8* DataBuffer::GetWritableData() { | 62 uint8* DataBuffer::GetWritableData() { |
| 64 return data_.get(); | 63 return data_.get(); |
| 65 } | 64 } |
| 66 | 65 |
| 67 | 66 |
| 68 void DataBuffer::SetDataSize(size_t data_size) { | 67 void DataBuffer::SetDataSize(int data_size) { |
| 69 DCHECK_LE(data_size, buffer_size_); | 68 DCHECK_LE(data_size, buffer_size_); |
| 70 data_size_ = data_size; | 69 data_size_ = data_size; |
| 71 } | 70 } |
| 72 | 71 |
| 73 size_t DataBuffer::GetBufferSize() const { | 72 int DataBuffer::GetBufferSize() const { |
| 74 return buffer_size_; | 73 return buffer_size_; |
| 75 } | 74 } |
| 76 | 75 |
| 77 void DataBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) { | 76 void DataBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) { |
| 78 decrypt_config_ = decrypt_config.Pass(); | 77 decrypt_config_ = decrypt_config.Pass(); |
| 79 } | 78 } |
| 80 | 79 |
| 81 } // namespace media | 80 } // namespace media |
| OLD | NEW |