| Index: media/base/data_buffer.cc
|
| diff --git a/media/base/data_buffer.cc b/media/base/data_buffer.cc
|
| index 9bd67d592883c958209ba9723e54348a21d88052..8c05aa47be8aadb01f6823089b23846c022e4772 100644
|
| --- a/media/base/data_buffer.cc
|
| +++ b/media/base/data_buffer.cc
|
| @@ -39,58 +39,58 @@ DataBuffer::DataBuffer(const uint8* data, int data_size)
|
| DataBuffer::~DataBuffer() {}
|
|
|
| // static
|
| -scoped_refptr<DataBuffer> DataBuffer::CopyFrom(const uint8* data, int size) {
|
| +scoped_refptr<DataBuffer> DataBuffer::copy_from(const uint8* data, int size) {
|
| // If you hit this CHECK you likely have a bug in a demuxer. Go fix it.
|
| CHECK(data);
|
| return make_scoped_refptr(new DataBuffer(data, size));
|
| }
|
|
|
| // static
|
| -scoped_refptr<DataBuffer> DataBuffer::CreateEOSBuffer() {
|
| +scoped_refptr<DataBuffer> DataBuffer::create_eos_buffer() {
|
| return make_scoped_refptr(new DataBuffer(NULL, 0));
|
| }
|
|
|
| -base::TimeDelta DataBuffer::GetTimestamp() const {
|
| - DCHECK(!IsEndOfStream());
|
| +base::TimeDelta DataBuffer::get_timestamp() const {
|
| + DCHECK(!is_end_of_stream());
|
| return timestamp_;
|
| }
|
|
|
| -void DataBuffer::SetTimestamp(const base::TimeDelta& timestamp) {
|
| - DCHECK(!IsEndOfStream());
|
| +void DataBuffer::set_timestamp(const base::TimeDelta& timestamp) {
|
| + DCHECK(!is_end_of_stream());
|
| timestamp_ = timestamp;
|
| }
|
|
|
| -base::TimeDelta DataBuffer::GetDuration() const {
|
| - DCHECK(!IsEndOfStream());
|
| +base::TimeDelta DataBuffer::get_duration() const {
|
| + DCHECK(!is_end_of_stream());
|
| return duration_;
|
| }
|
|
|
| -void DataBuffer::SetDuration(const base::TimeDelta& duration) {
|
| - DCHECK(!IsEndOfStream());
|
| +void DataBuffer::set_duration(const base::TimeDelta& duration) {
|
| + DCHECK(!is_end_of_stream());
|
| duration_ = duration;
|
| }
|
|
|
| -bool DataBuffer::IsEndOfStream() const {
|
| +bool DataBuffer::is_end_of_stream() const {
|
| return data_ == NULL;
|
| }
|
|
|
| -const uint8* DataBuffer::GetData() const {
|
| - DCHECK(!IsEndOfStream());
|
| +const uint8* DataBuffer::get_data() const {
|
| + DCHECK(!is_end_of_stream());
|
| return data_.get();
|
| }
|
|
|
| -uint8* DataBuffer::GetWritableData() {
|
| - DCHECK(!IsEndOfStream());
|
| +uint8* DataBuffer::get_writable_data() {
|
| + DCHECK(!is_end_of_stream());
|
| return data_.get();
|
| }
|
|
|
| -int DataBuffer::GetDataSize() const {
|
| - DCHECK(!IsEndOfStream());
|
| +int DataBuffer::get_data_size() const {
|
| + DCHECK(!is_end_of_stream());
|
| return data_size_;
|
| }
|
|
|
| -void DataBuffer::SetDataSize(int data_size) {
|
| - DCHECK(!IsEndOfStream());
|
| +void DataBuffer::set_data_size(int data_size) {
|
| + DCHECK(!is_end_of_stream());
|
| CHECK_LE(data_size, buffer_size_);
|
| data_size_ = data_size;
|
| }
|
|
|