MSE: Allow fully discarding frames with resulting timestamps below 0

media/filters/frame_processor.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/filters/frame_processor.h"
 
 #include "base/stl_util.h"
 #include "media/base/buffers.h"
 #include "media/base/stream_parser_buffer.h"
 
@@ skipping 220 matching lines @@
         // 7.2. - 7.5.:
         Reset();
 
         // 7.6. Jump to the Loop Top step above to restart processing of the
         //      current coded frame.
         DVLOG(3) << __FUNCTION__ << ": Discontinuity: reprocessing frame";
         continue;
       }
     }
 
-    // 8. If the presentation timestamp or decode timestamp is less than the
-    // presentation start time, then run the end of stream algorithm with the
-    // error parameter set to "decode", and abort these steps.
-    if (presentation_timestamp < base::TimeDelta() ||
-        decode_timestamp < base::TimeDelta()) {
-      DVLOG(2) << __FUNCTION__
-               << ": frame PTS=" << presentation_timestamp.InSecondsF()
-               << " or DTS=" << decode_timestamp.InSecondsF()
-               << " negative after applying timestampOffset and handling any "
-               << " discontinuity";
-      return false;
-    }
-
     // 9. Let frame end timestamp equal the sum of presentation timestamp and
     //    frame duration.
     const base::TimeDelta frame_end_timestamp =
         presentation_timestamp + frame_duration;
 
     // 10.  If presentation timestamp is less than appendWindowStart, then set
     //      the need random access point flag to true, drop the coded frame, and
     //      jump to the top of the loop to start processing the next coded
     //      frame.
     // Note: We keep the result of partial discard of a buffer that overlaps
@@ skipping 29 matching lines @@
       if (!sequence_mode_) {
         // This also triggers a discontinuity so we need to treat the next
         // frames appended within the append window as if they were the
         // beginning of a new segment.
         *new_media_segment = true;
       }
 
       return true;
     }
 
+    // Note: This step is relocated, versus April 1 spec, to allow append window
+    // processing to first filter coded frames shifted by |timestamp_offset_| in
+    // such a way that their PTS is negative.
+    // 8. If the presentation timestamp or decode timestamp is less than the
+    // presentation start time, then run the end of stream algorithm with the
+    // error parameter set to "decode", and abort these steps.
+    DCHECK(presentation_timestamp >= base::TimeDelta());
+    if (decode_timestamp < base::TimeDelta()) {
+      // B-frames may still result in negative DTS here after being shifted by
+      // |timestamp_offset_|.
+      DVLOG(2) << __FUNCTION__
+               << ": frame PTS=" << presentation_timestamp.InSecondsF()
+               << " has negative DTS=" << decode_timestamp.InSecondsF()
+               << " after applying timestampOffset, handling any discontinuity,"
+               << " and filtering against append window";
+      return false;
+    }
+
     // 12. If the need random access point flag on track buffer equals true,
     //     then run the following steps:
     if (track_buffer->needs_random_access_point()) {
       // 12.1. If the coded frame is not a random access point, then drop the
       //       coded frame and jump to the top of the loop to start processing
       //       the next coded frame.
       if (!frame->IsKeyframe()) {
         DVLOG(3) << __FUNCTION__
                  << ": Dropping frame that is not a random access point";
         return true;
@@ skipping 31 matching lines @@
 
     // 21. If highest presentation timestamp for track buffer is unset or frame
     //     end timestamp is greater than highest presentation timestamp, then
     //     set highest presentation timestamp for track buffer to frame end
     //     timestamp.
     track_buffer->SetHighestPresentationTimestampIfIncreased(
         frame_end_timestamp);
 
     // 22. If frame end timestamp is greater than group end timestamp, then set
     //     group end timestamp equal to frame end timestamp.
-    DCHECK(group_end_timestamp_ >= base::TimeDelta());
     if (frame_end_timestamp > group_end_timestamp_)
       group_end_timestamp_ = frame_end_timestamp;
+    DCHECK(group_end_timestamp_ >= base::TimeDelta());
 
     return true;
   }
 
   NOTREACHED();
   return false;
 }
 
 void FrameProcessor::SetAllTrackBuffersNeedRandomAccessPoint() {
   for (TrackBufferMap::iterator itr = track_buffers_.begin();
        itr != track_buffers_.end(); ++itr) {
     itr->second->set_needs_random_access_point(true);
   }
 }
 
 }  // namespace media