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

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

Issue 16297002: Update media/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « media/base/data_buffer_unittest.cc ('k') | media/base/decoder_buffer_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
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 earliest_valid_timestamp_ = buffer->GetTimestamp(); 44 earliest_valid_timestamp_ = buffer->GetTimestamp();
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() == buffer) { 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()->GetTimestamp();
75 base::TimeDelta end = in_order_queue_.back()->GetTimestamp(); 75 base::TimeDelta end = in_order_queue_.back()->GetTimestamp();
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/data_buffer_unittest.cc ('k') | media/base/decoder_buffer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698