| Index: media/base/decoder_buffer_queue.cc
|
| diff --git a/media/base/decoder_buffer_queue.cc b/media/base/decoder_buffer_queue.cc
|
| index 8d317c0cb607d8b2b4a68221844c0f22792aaec9..e03a6e8269a1beaa3b05cceb17f0e1144a538753 100644
|
| --- a/media/base/decoder_buffer_queue.cc
|
| +++ b/media/base/decoder_buffer_queue.cc
|
| @@ -17,31 +17,31 @@ DecoderBufferQueue::DecoderBufferQueue()
|
| DecoderBufferQueue::~DecoderBufferQueue() {}
|
|
|
| void DecoderBufferQueue::Push(const scoped_refptr<DecoderBuffer>& buffer) {
|
| - CHECK(!buffer->IsEndOfStream());
|
| + CHECK(!buffer->is_end_of_stream());
|
|
|
| queue_.push_back(buffer);
|
|
|
| // TODO(scherkus): FFmpeg returns some packets with no timestamp after
|
| // seeking. Fix and turn this into CHECK(). See http://crbug.com/162192
|
| - if (buffer->GetTimestamp() == kNoTimestamp()) {
|
| + if (buffer->get_timestamp() == kNoTimestamp()) {
|
| DVLOG(1) << "Buffer has no timestamp";
|
| return;
|
| }
|
|
|
| if (earliest_valid_timestamp_ == kNoTimestamp()) {
|
| - earliest_valid_timestamp_ = buffer->GetTimestamp();
|
| + earliest_valid_timestamp_ = buffer->get_timestamp();
|
| }
|
|
|
| - if (buffer->GetTimestamp() < earliest_valid_timestamp_) {
|
| + if (buffer->get_timestamp() < earliest_valid_timestamp_) {
|
| DVLOG(1)
|
| << "Out of order timestamps: "
|
| - << buffer->GetTimestamp().InMicroseconds()
|
| + << buffer->get_timestamp().InMicroseconds()
|
| << " vs. "
|
| << earliest_valid_timestamp_.InMicroseconds();
|
| return;
|
| }
|
|
|
| - earliest_valid_timestamp_ = buffer->GetTimestamp();
|
| + earliest_valid_timestamp_ = buffer->get_timestamp();
|
| in_order_queue_.push_back(buffer);
|
| }
|
|
|
| @@ -71,8 +71,8 @@ base::TimeDelta DecoderBufferQueue::Duration() {
|
| if (in_order_queue_.size() < 2)
|
| return base::TimeDelta();
|
|
|
| - base::TimeDelta start = in_order_queue_.front()->GetTimestamp();
|
| - base::TimeDelta end = in_order_queue_.back()->GetTimestamp();
|
| + base::TimeDelta start = in_order_queue_.front()->get_timestamp();
|
| + base::TimeDelta end = in_order_queue_.back()->get_timestamp();
|
| return end - start;
|
| }
|
|
|
|
|