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

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

Issue 2140001: Removed PushSource::Packet. SeekableBuffer.current_time() fixed to return (Closed)
Patch Set: - Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/seekable_buffer.h" 5 #include "media/base/seekable_buffer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "media/base/data_buffer.h" 10 #include "media/base/data_buffer.h"
11 11
12 namespace media { 12 namespace media {
13 13
14 SeekableBuffer::SeekableBuffer(size_t backward_capacity, 14 SeekableBuffer::SeekableBuffer(size_t backward_capacity,
15 size_t forward_capacity) 15 size_t forward_capacity)
16 : current_buffer_offset_(0), 16 : current_buffer_offset_(0),
17 backward_capacity_(backward_capacity), 17 backward_capacity_(backward_capacity),
18 backward_bytes_(0), 18 backward_bytes_(0),
19 forward_capacity_(forward_capacity), 19 forward_capacity_(forward_capacity),
20 forward_bytes_(0) { 20 forward_bytes_(0),
21 current_time_(StreamSample::kInvalidTimestamp) {
21 current_buffer_ = buffers_.begin(); 22 current_buffer_ = buffers_.begin();
22 } 23 }
23 24
24 SeekableBuffer::~SeekableBuffer() { 25 SeekableBuffer::~SeekableBuffer() {
25 } 26 }
26 27
27 void SeekableBuffer::Clear() { 28 void SeekableBuffer::Clear() {
28 buffers_.clear(); 29 buffers_.clear();
29 current_buffer_ = buffers_.begin(); 30 current_buffer_ = buffers_.begin();
30 current_buffer_offset_ = 0; 31 current_buffer_offset_ = 0;
31 backward_bytes_ = 0; 32 backward_bytes_ = 0;
32 forward_bytes_ = 0; 33 forward_bytes_ = 0;
33 current_time_ = base::TimeDelta(); 34 current_time_ = StreamSample::kInvalidTimestamp;
34 } 35 }
35 36
36 37
37 size_t SeekableBuffer::Read(uint8* data, size_t size) { 38 size_t SeekableBuffer::Read(uint8* data, size_t size) {
38 DCHECK(data); 39 DCHECK(data);
39 return InternalRead(data, size, true); 40 return InternalRead(data, size, true);
40 } 41 }
41 42
42 size_t SeekableBuffer::Peek(uint8* data, size_t size) { 43 size_t SeekableBuffer::Peek(uint8* data, size_t size) {
43 DCHECK(data); 44 DCHECK(data);
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 (*buffer)->GetTimestamp().InMicroseconds() > 0) { 256 (*buffer)->GetTimestamp().InMicroseconds() > 0) {
256 int64 time_offset = ((*buffer)->GetDuration().InMicroseconds() * 257 int64 time_offset = ((*buffer)->GetDuration().InMicroseconds() *
257 offset) / (*buffer)->GetDataSize(); 258 offset) / (*buffer)->GetDataSize();
258 259
259 current_time_ = (*buffer)->GetTimestamp() + 260 current_time_ = (*buffer)->GetTimestamp() +
260 base::TimeDelta::FromMicroseconds(time_offset); 261 base::TimeDelta::FromMicroseconds(time_offset);
261 } 262 }
262 } 263 }
263 264
264 } // namespace media 265 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698