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

media/formats/mp4/track_run_iterator.h

 // Copyright 2014 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.
 
 #ifndef MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
 #define MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
+#include "media/base/stream_parser_buffer.h"
 #include "media/formats/mp4/box_definitions.h"
 #include "media/formats/mp4/cenc.h"
 
 namespace media {
 
 class DecryptConfig;
 
 namespace mp4 {
 
-using base::TimeDelta;
 base::TimeDelta MEDIA_EXPORT TimeDeltaFromRational(int64 numer, int64 denom);
+DecodeTimestamp MEDIA_EXPORT DecodeTimestampFromRational(int64 numer,
+                                                         int64 denom);
 
 struct SampleInfo;
 struct TrackRunInfo;
 
 class MEDIA_EXPORT TrackRunIterator {
  public:
   // Create a new TrackRunIterator. A reference to |moov| will be retained for
   // the lifetime of this object.
   TrackRunIterator(const Movie* moov, const LogCB& log_cb);
   ~TrackRunIterator();
@@ skipping 32 matching lines @@
   int aux_info_size() const;
   bool is_encrypted() const;
   bool is_audio() const;
   // Only one is valid, based on the value of is_audio().
   const AudioSampleEntry& audio_description() const;
   const VideoSampleEntry& video_description() const;
 
   // Properties of the current sample. Only valid if IsSampleValid().
   int64 sample_offset() const;
   int sample_size() const;
-  TimeDelta dts() const;
-  TimeDelta cts() const;
-  TimeDelta duration() const;
+  DecodeTimestamp dts() const;
+  base::TimeDelta cts() const;
+  base::TimeDelta duration() const;
   bool is_keyframe() const;
   bool is_random_access_point() const;
 
   // Only call when is_encrypted() is true and AuxInfoNeedsToBeCached() is
   // false. Result is owned by caller.
   scoped_ptr<DecryptConfig> GetDecryptConfig();
 
  private:
   void ResetRun();
   const TrackEncryption& track_encryption() const;
@@ skipping 19 matching lines @@
   int64 sample_dts_;
   int64 sample_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(TrackRunIterator);
 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP4_TRACK_RUN_ITERATOR_H_