| Index: media/base/stream_parser_buffer.cc
|
| diff --git a/media/base/stream_parser_buffer.cc b/media/base/stream_parser_buffer.cc
|
| index f1dd6fd9dee65355c2d7d2e20f5d1abd0130bef4..6618754d771f9c35a685d9f849eeef4c21099f21 100644
|
| --- a/media/base/stream_parser_buffer.cc
|
| +++ b/media/base/stream_parser_buffer.cc
|
| @@ -9,17 +9,17 @@
|
|
|
| namespace media {
|
|
|
| -scoped_refptr<StreamParserBuffer> StreamParserBuffer::CreateEOSBuffer() {
|
| +scoped_refptr<StreamParserBuffer> StreamParserBuffer::create_eos_buffer() {
|
| return make_scoped_refptr(new StreamParserBuffer(NULL, 0, NULL, 0, false));
|
| }
|
|
|
| -scoped_refptr<StreamParserBuffer> StreamParserBuffer::CopyFrom(
|
| +scoped_refptr<StreamParserBuffer> StreamParserBuffer::copy_from(
|
| const uint8* data, int data_size, bool is_keyframe) {
|
| return make_scoped_refptr(
|
| new StreamParserBuffer(data, data_size, NULL, 0, is_keyframe));
|
| }
|
|
|
| -scoped_refptr<StreamParserBuffer> StreamParserBuffer::CopyFrom(
|
| +scoped_refptr<StreamParserBuffer> StreamParserBuffer::copy_from(
|
| const uint8* data, int data_size,
|
| const uint8* side_data, int side_data_size, bool is_keyframe) {
|
| return make_scoped_refptr(
|
| @@ -29,7 +29,7 @@ scoped_refptr<StreamParserBuffer> StreamParserBuffer::CopyFrom(
|
|
|
| base::TimeDelta StreamParserBuffer::GetDecodeTimestamp() const {
|
| if (decode_timestamp_ == kNoTimestamp())
|
| - return GetTimestamp();
|
| + return get_timestamp();
|
| return decode_timestamp_;
|
| }
|
|
|
| @@ -48,7 +48,7 @@ StreamParserBuffer::StreamParserBuffer(const uint8* data, int data_size,
|
| // duration to force clients to set them? Today they end up being zero which
|
| // is both a common and valid value and could lead to bugs.
|
| if (data) {
|
| - SetDuration(kNoTimestamp());
|
| + set_duration(kNoTimestamp());
|
| }
|
| }
|
|
|
|
|