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

media/formats/mp2t/es_parser_h264.cc

 // 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.
 
 #include "media/formats/mp2t/es_parser_h264.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "media/base/buffers.h"
@@ skipping 21 matching lines @@
       h264_parser_(new H264Parser()),
       current_access_unit_pos_(0),
       next_access_unit_pos_(0) {
 }
 
 EsParserH264::~EsParserH264() {
 }
 
 bool EsParserH264::Parse(const uint8* buf, int size,
                          base::TimeDelta pts,
-                         base::TimeDelta dts) {
+                         DecodeTimestamp dts) {
   // Note: Parse is invoked each time a PES packet has been reassembled.
   // Unfortunately, a PES packet does not necessarily map
   // to an h264 access unit, although the HLS recommendation is to use one PES
   // for each access unit (but this is just a recommendation and some streams
   // do not comply with this recommendation).
 
   // HLS recommendation: "In AVC video, you should have both a DTS and a
   // PTS in each PES header".
   // However, some streams do not comply with this recommendation.
   DVLOG_IF(1, pts == kNoTimestamp()) << "Each video PES should have a PTS";
   if (pts != kNoTimestamp()) {
     TimingDesc timing_desc;
     timing_desc.pts = pts;
-    timing_desc.dts = (dts != kNoTimestamp()) ? dts : pts;
+    timing_desc.dts = (dts != kNoDecodeTimestamp()) ? dts :
+        DecodeTimestamp::FromPresentationTime(pts);
 
     // Link the end of the byte queue with the incoming timing descriptor.
     timing_desc_list_.push_back(
         std::pair<int64, TimingDesc>(es_queue_->tail(), timing_desc));
   }
 
   // Add the incoming bytes to the ES queue.
   es_queue_->Push(buf, size);
   return ParseInternal();
 }
@@ skipping 157 matching lines @@
                    is_key_frame, pps_id_for_access_unit));
   current_access_unit_pos_ = next_access_unit_pos_;
   es_queue_->Trim(current_access_unit_pos_);
 
   return true;
 }
 
 bool EsParserH264::EmitFrame(int64 access_unit_pos, int access_unit_size,
                              bool is_key_frame, int pps_id) {
   // Get the access unit timing info.
-  TimingDesc current_timing_desc = {kNoTimestamp(), kNoTimestamp()};
+  TimingDesc current_timing_desc = {kNoDecodeTimestamp(), kNoTimestamp()};
   while (!timing_desc_list_.empty() &&
          timing_desc_list_.front().first <= access_unit_pos) {
     current_timing_desc = timing_desc_list_.front().second;
     timing_desc_list_.pop_front();
   }
   if (current_timing_desc.pts == kNoTimestamp())
     return false;
 
   // Update the video decoder configuration if needed.
   const H264PPS* pps = h264_parser_->GetPPS(pps_id);
@@ skipping 80 matching lines @@
              << " height=" << sps->sar_height;
     last_video_decoder_config_ = video_decoder_config;
     es_adapter_.OnConfigChanged(video_decoder_config);
   }
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media
-