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

Unified Diff: media/base/seekable_buffer.cc

Issue 10342005: media::SeekableBuffer should use kNoTimestamp() instead of zero. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/base/seekable_buffer_unittest.cc » ('j') | media/base/seekable_buffer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/seekable_buffer.cc
diff --git a/media/base/seekable_buffer.cc b/media/base/seekable_buffer.cc
index b88153acc3fda9c814738bbb6f3cc38257356e3a..8cfcf989729451572432635b63bb3762250570f4 100644
--- a/media/base/seekable_buffer.cc
+++ b/media/base/seekable_buffer.cc
@@ -61,7 +61,7 @@ bool SeekableBuffer::GetCurrentChunk(const uint8** data, int* size) const {
}
bool SeekableBuffer::Append(Buffer* buffer_in) {
- if (buffers_.empty() && buffer_in->GetTimestamp().InMicroseconds() > 0) {
+ if (buffers_.empty() && buffer_in->GetTimestamp() != kNoTimestamp()) {
current_time_ = buffer_in->GetTimestamp();
}
@@ -267,8 +267,7 @@ int SeekableBuffer::InternalRead(uint8* data, int size,
void SeekableBuffer::UpdateCurrentTime(BufferQueue::iterator buffer,
int offset) {
// Garbage values are unavoidable, so this check will remain.
- if (buffer != buffers_.end() &&
- (*buffer)->GetTimestamp().InMicroseconds() > 0) {
+ if (buffer != buffers_.end() && (*buffer)->GetTimestamp() != kNoTimestamp()) {
int64 time_offset = ((*buffer)->GetDuration().InMicroseconds() *
offset) / (*buffer)->GetDataSize();
« no previous file with comments | « no previous file | media/base/seekable_buffer_unittest.cc » ('j') | media/base/seekable_buffer_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698