Introduce DecodeTimestamp class to make it easier to distiguish presentation and decode timestamps.

media/base/stream_parser_buffer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/stream_parser_buffer.h"
 
 #include "base/logging.h"
 #include "media/base/buffers.h"
 
 namespace media {
@@ skipping 43 matching lines @@
 
 scoped_refptr<StreamParserBuffer> StreamParserBuffer::CopyFrom(
     const uint8* data, int data_size,
     const uint8* side_data, int side_data_size,
     bool is_keyframe, Type type, TrackId track_id) {
   return make_scoped_refptr(
       new StreamParserBuffer(data, data_size, side_data, side_data_size,
                              is_keyframe, type, track_id));
 }
 
-base::TimeDelta StreamParserBuffer::GetDecodeTimestamp() const {
-  if (decode_timestamp_ == kNoTimestamp())
-    return timestamp();
+DecodeTimestamp StreamParserBuffer::GetDecodeTimestamp() const {
+  if (decode_timestamp_ == kNoDecodeTimestamp())
+    return DecodeTimestamp::FromPresentationTime(timestamp());
   return decode_timestamp_;
 }
 
-void StreamParserBuffer::SetDecodeTimestamp(base::TimeDelta timestamp) {
+void StreamParserBuffer::SetDecodeTimestamp(DecodeTimestamp timestamp) {
   decode_timestamp_ = timestamp;
   if (preroll_buffer_)
     preroll_buffer_->SetDecodeTimestamp(timestamp);
 }
 
 StreamParserBuffer::StreamParserBuffer(const uint8* data, int data_size,
                                        const uint8* side_data,
                                        int side_data_size, bool is_keyframe,
                                        Type type, TrackId track_id)
     : DecoderBuffer(data, data_size, side_data, side_data_size),
       is_keyframe_(is_keyframe),
-      decode_timestamp_(kNoTimestamp()),
+      decode_timestamp_(kNoDecodeTimestamp()),
       config_id_(kInvalidConfigId),
       type_(type),
       track_id_(track_id) {
   // TODO(scherkus): Should DataBuffer constructor accept a timestamp and
   // duration to force clients to set them? Today they end up being zero which
   // is both a common and valid value and could lead to bugs.
   if (data) {
     set_duration(kNoTimestamp());
   }
 }
@@ skipping 96 matching lines @@
       std::make_pair(kInfiniteDuration(), base::TimeDelta()));
 }
 
 void StreamParserBuffer::set_timestamp(base::TimeDelta timestamp) {
   DecoderBuffer::set_timestamp(timestamp);
   if (preroll_buffer_)
     preroll_buffer_->set_timestamp(timestamp);
 }
 
 }  // namespace media