| Index: media/base/decoder_buffer.cc
|
| diff --git a/media/base/decoder_buffer.cc b/media/base/decoder_buffer.cc
|
| index d3acc26687fb69125667317389df212da2727a08..f5696c02f2a99ef0fd5382bf32981444e9976f16 100644
|
| --- a/media/base/decoder_buffer.cc
|
| +++ b/media/base/decoder_buffer.cc
|
| @@ -46,7 +46,7 @@ void DecoderBuffer::Initialize() {
|
| }
|
|
|
| // static
|
| -scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data,
|
| +scoped_refptr<DecoderBuffer> DecoderBuffer::copy_from(const uint8* data,
|
| int data_size) {
|
| // If you hit this CHECK you likely have a bug in a demuxer. Go fix it.
|
| CHECK(data);
|
| @@ -54,7 +54,7 @@ scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data,
|
| }
|
|
|
| // static
|
| -scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data,
|
| +scoped_refptr<DecoderBuffer> DecoderBuffer::copy_from(const uint8* data,
|
| int data_size,
|
| const uint8* side_data,
|
| int side_data_size) {
|
| @@ -66,71 +66,71 @@ scoped_refptr<DecoderBuffer> DecoderBuffer::CopyFrom(const uint8* data,
|
| }
|
|
|
| // static
|
| -scoped_refptr<DecoderBuffer> DecoderBuffer::CreateEOSBuffer() {
|
| +scoped_refptr<DecoderBuffer> DecoderBuffer::create_eos_buffer() {
|
| return make_scoped_refptr(new DecoderBuffer(NULL, 0, NULL, 0));
|
| }
|
|
|
| -base::TimeDelta DecoderBuffer::GetTimestamp() const {
|
| - DCHECK(!IsEndOfStream());
|
| +base::TimeDelta DecoderBuffer::get_timestamp() const {
|
| + DCHECK(!is_end_of_stream());
|
| return timestamp_;
|
| }
|
|
|
| -void DecoderBuffer::SetTimestamp(const base::TimeDelta& timestamp) {
|
| - DCHECK(!IsEndOfStream());
|
| +void DecoderBuffer::set_timestamp(const base::TimeDelta& timestamp) {
|
| + DCHECK(!is_end_of_stream());
|
| timestamp_ = timestamp;
|
| }
|
|
|
| -base::TimeDelta DecoderBuffer::GetDuration() const {
|
| - DCHECK(!IsEndOfStream());
|
| +base::TimeDelta DecoderBuffer::get_duration() const {
|
| + DCHECK(!is_end_of_stream());
|
| return duration_;
|
| }
|
|
|
| -void DecoderBuffer::SetDuration(const base::TimeDelta& duration) {
|
| - DCHECK(!IsEndOfStream());
|
| +void DecoderBuffer::set_duration(const base::TimeDelta& duration) {
|
| + DCHECK(!is_end_of_stream());
|
| duration_ = duration;
|
| }
|
|
|
| -const uint8* DecoderBuffer::GetData() const {
|
| - DCHECK(!IsEndOfStream());
|
| +const uint8* DecoderBuffer::get_data() const {
|
| + DCHECK(!is_end_of_stream());
|
| return data_.get();
|
| }
|
|
|
| -uint8* DecoderBuffer::GetWritableData() const {
|
| - DCHECK(!IsEndOfStream());
|
| +uint8* DecoderBuffer::get_writable_data() const {
|
| + DCHECK(!is_end_of_stream());
|
| return data_.get();
|
| }
|
|
|
| -int DecoderBuffer::GetDataSize() const {
|
| - DCHECK(!IsEndOfStream());
|
| +int DecoderBuffer::get_data_size() const {
|
| + DCHECK(!is_end_of_stream());
|
| return size_;
|
| }
|
|
|
| -const uint8* DecoderBuffer::GetSideData() const {
|
| - DCHECK(!IsEndOfStream());
|
| +const uint8* DecoderBuffer::get_side_data() const {
|
| + DCHECK(!is_end_of_stream());
|
| return side_data_.get();
|
| }
|
|
|
| -int DecoderBuffer::GetSideDataSize() const {
|
| - DCHECK(!IsEndOfStream());
|
| +int DecoderBuffer::get_side_data_size() const {
|
| + DCHECK(!is_end_of_stream());
|
| return side_data_size_;
|
| }
|
|
|
| -const DecryptConfig* DecoderBuffer::GetDecryptConfig() const {
|
| - DCHECK(!IsEndOfStream());
|
| +const DecryptConfig* DecoderBuffer::get_decrypt_config() const {
|
| + DCHECK(!is_end_of_stream());
|
| return decrypt_config_.get();
|
| }
|
|
|
| void DecoderBuffer::SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config) {
|
| - DCHECK(!IsEndOfStream());
|
| + DCHECK(!is_end_of_stream());
|
| decrypt_config_ = decrypt_config.Pass();
|
| }
|
|
|
| -bool DecoderBuffer::IsEndOfStream() const {
|
| +bool DecoderBuffer::is_end_of_stream() const {
|
| return data_ == NULL;
|
| }
|
|
|
| -std::string DecoderBuffer::AsHumanReadableString() {
|
| - if (IsEndOfStream()) {
|
| +std::string DecoderBuffer::as_human_readable_string() {
|
| + if (is_end_of_stream()) {
|
| return "end of stream";
|
| }
|
|
|
|
|