Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(670)

Side by Side Diff: media/base/decoder_buffer_queue.cc

Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@localrefactor
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/decoder_buffer.cc ('k') | media/base/decoder_buffer_queue_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "media/base/decoder_buffer_queue.h" 5 #include "media/base/decoder_buffer_queue.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/buffers.h" 8 #include "media/base/buffers.h"
9 #include "media/base/decoder_buffer.h" 9 #include "media/base/decoder_buffer.h"
10 10
11 namespace media { 11 namespace media {
12 12
13 DecoderBufferQueue::DecoderBufferQueue() 13 DecoderBufferQueue::DecoderBufferQueue()
14 : earliest_valid_timestamp_(kNoTimestamp()) { 14 : earliest_valid_timestamp_(kNoTimestamp()) {
15 } 15 }
16 16
17 DecoderBufferQueue::~DecoderBufferQueue() {} 17 DecoderBufferQueue::~DecoderBufferQueue() {}
18 18
19 void DecoderBufferQueue::Push(const scoped_refptr<DecoderBuffer>& buffer) { 19 void DecoderBufferQueue::Push(const scoped_refptr<DecoderBuffer>& buffer) {
20 CHECK(!buffer->IsEndOfStream()); 20 CHECK(!buffer->end_of_stream());
21 21
22 queue_.push_back(buffer); 22 queue_.push_back(buffer);
23 23
24 // TODO(scherkus): FFmpeg returns some packets with no timestamp after 24 // TODO(scherkus): FFmpeg returns some packets with no timestamp after
25 // seeking. Fix and turn this into CHECK(). See http://crbug.com/162192 25 // seeking. Fix and turn this into CHECK(). See http://crbug.com/162192
26 if (buffer->GetTimestamp() == kNoTimestamp()) { 26 if (buffer->timestamp() == kNoTimestamp()) {
27 DVLOG(1) << "Buffer has no timestamp"; 27 DVLOG(1) << "Buffer has no timestamp";
28 return; 28 return;
29 } 29 }
30 30
31 if (earliest_valid_timestamp_ == kNoTimestamp()) { 31 if (earliest_valid_timestamp_ == kNoTimestamp()) {
32 earliest_valid_timestamp_ = buffer->GetTimestamp(); 32 earliest_valid_timestamp_ = buffer->timestamp();
33 } 33 }
34 34
35 if (buffer->GetTimestamp() < earliest_valid_timestamp_) { 35 if (buffer->timestamp() < earliest_valid_timestamp_) {
36 DVLOG(1) 36 DVLOG(1)
37 << "Out of order timestamps: " 37 << "Out of order timestamps: "
38 << buffer->GetTimestamp().InMicroseconds() 38 << buffer->timestamp().InMicroseconds()
39 << " vs. " 39 << " vs. "
40 << earliest_valid_timestamp_.InMicroseconds(); 40 << earliest_valid_timestamp_.InMicroseconds();
41 return; 41 return;
42 } 42 }
43 43
44 earliest_valid_timestamp_ = buffer->GetTimestamp(); 44 earliest_valid_timestamp_ = buffer->timestamp();
45 in_order_queue_.push_back(buffer); 45 in_order_queue_.push_back(buffer);
46 } 46 }
47 47
48 scoped_refptr<DecoderBuffer> DecoderBufferQueue::Pop() { 48 scoped_refptr<DecoderBuffer> DecoderBufferQueue::Pop() {
49 scoped_refptr<DecoderBuffer> buffer = queue_.front(); 49 scoped_refptr<DecoderBuffer> buffer = queue_.front();
50 queue_.pop_front(); 50 queue_.pop_front();
51 51
52 if (!in_order_queue_.empty() && 52 if (!in_order_queue_.empty() &&
53 in_order_queue_.front().get() == buffer.get()) { 53 in_order_queue_.front().get() == buffer.get()) {
54 in_order_queue_.pop_front(); 54 in_order_queue_.pop_front();
55 } 55 }
56 56
57 return buffer; 57 return buffer;
58 } 58 }
59 59
60 void DecoderBufferQueue::Clear() { 60 void DecoderBufferQueue::Clear() {
61 queue_.clear(); 61 queue_.clear();
62 in_order_queue_.clear(); 62 in_order_queue_.clear();
63 earliest_valid_timestamp_ = kNoTimestamp(); 63 earliest_valid_timestamp_ = kNoTimestamp();
64 } 64 }
65 65
66 bool DecoderBufferQueue::IsEmpty() { 66 bool DecoderBufferQueue::IsEmpty() {
67 return queue_.empty(); 67 return queue_.empty();
68 } 68 }
69 69
70 base::TimeDelta DecoderBufferQueue::Duration() { 70 base::TimeDelta DecoderBufferQueue::Duration() {
71 if (in_order_queue_.size() < 2) 71 if (in_order_queue_.size() < 2)
72 return base::TimeDelta(); 72 return base::TimeDelta();
73 73
74 base::TimeDelta start = in_order_queue_.front()->GetTimestamp(); 74 base::TimeDelta start = in_order_queue_.front()->timestamp();
75 base::TimeDelta end = in_order_queue_.back()->GetTimestamp(); 75 base::TimeDelta end = in_order_queue_.back()->timestamp();
76 return end - start; 76 return end - start;
77 } 77 }
78 78
79 } // namespace media 79 } // namespace media
OLDNEW
« no previous file with comments | « media/base/decoder_buffer.cc ('k') | media/base/decoder_buffer_queue_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698