Use FFmpeg's reordered_opaque for presentation timestamp reordering.

media/filters/video_decoder_impl.cc

 // Copyright (c) 2010 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/filters/video_decoder_impl.h"
 
 #include "base/task.h"
 #include "media/base/filters.h"
 #include "media/base/limits.h"
 #include "media/base/video_frame.h"
@@ skipping 194 matching lines @@
 
 VideoDecoderImpl::TimeTuple VideoDecoderImpl::FindPtsAndDuration(
     const AVRational& time_base,
     const PtsHeap& pts_heap,
     const TimeTuple& last_pts,
     const VideoFrame* frame) {
   TimeTuple pts;
 
   // First search the VideoFrame for the pts. This is the most authoritative.
   // Make a special exclusion for the value pts == 0.  Though this is
-  // technically a valid value, it seems a number of ffmpeg codecs will
+  // technically a valid value, it seems a number of FFmpeg codecs will
   // mistakenly always set pts to 0.
+  //
+  // TODO(scherkus): FFmpegVideoDecodeEngine should be able to detect this
+  // situation and set the timestamp to kInvalidTimestamp.
   DCHECK(frame);
   base::TimeDelta timestamp = frame->GetTimestamp();
   if (timestamp != StreamSample::kInvalidTimestamp &&
       timestamp.ToInternalValue() != 0) {
-    pts.timestamp = ConvertTimestamp(time_base, timestamp.ToInternalValue());
-    pts.duration = ConvertTimestamp(time_base, 1 + frame->GetRepeatCount());
-    return pts;
+    pts.timestamp = timestamp;
+  } else if (!pts_heap.IsEmpty()) {
+    // If the frame did not have pts, try to get the pts from the |pts_heap|.
+    pts.timestamp = pts_heap.Top();
+  } else if (last_pts.timestamp != StreamSample::kInvalidTimestamp &&
+             last_pts.duration != StreamSample::kInvalidTimestamp) {
+    // Guess assuming this frame was the same as the last frame.
+    pts.timestamp = last_pts.timestamp + last_pts.duration;
+  } else {
+    // Now we really have no clue!!!  Mark an invalid timestamp and let the
+    // video renderer handle it (i.e., drop frame).
+    pts.timestamp = StreamSample::kInvalidTimestamp;
   }
 
-  if (!pts_heap.IsEmpty()) {
-    // If the frame did not have pts, try to get the pts from the |pts_heap|.
-    pts.timestamp = pts_heap.Top();
+  // Fill in the duration, using the frame itself as the authoratative source.
+  base::TimeDelta duration = frame->GetDuration();
+  if (duration != StreamSample::kInvalidTimestamp &&
+      duration.ToInternalValue() != 0) {
+    pts.duration = duration;
   } else {
-    DCHECK(last_pts.timestamp != StreamSample::kInvalidTimestamp);
-    DCHECK(last_pts.duration != StreamSample::kInvalidTimestamp);
-    // Unable to read the pts from anywhere. Time to guess.
-    pts.timestamp = last_pts.timestamp + last_pts.duration;
+    // Otherwise assume a normal frame duration.
+    pts.duration = ConvertTimestamp(time_base, 1);
   }
 
-  // Fill in the duration while accounting for repeated frames.
-  pts.duration = ConvertTimestamp(time_base, 1);
-
   return pts;
 }
 
 void VideoDecoderImpl::SignalPipelineError() {
   host()->SetError(PIPELINE_ERROR_DECODE);
   state_ = kDecodeFinished;
 }
 
 void VideoDecoderImpl::SetVideoDecodeEngineForTest(
     VideoDecodeEngine* engine) {
   decode_engine_.reset(engine);
 }
 
 }  // namespace media