Update ChunkDemuxer unit tests to use real muxed clusters.

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 <cstdlib>
 
 #include "base/stl_util.h"
 #include "media/base/buffers.h"
@@ skipping 363 matching lines @@
     // We use base::TimeDelta instead of double.
     base::TimeDelta presentation_timestamp = frame->timestamp();
     base::TimeDelta decode_timestamp = frame->GetDecodeTimestamp();
     base::TimeDelta frame_duration = frame->duration();
 
     DVLOG(3) << __FUNCTION__ << ": Processing frame "
              << "Type=" << frame->type()
              << ", TrackID=" << frame->track_id()
              << ", PTS=" << presentation_timestamp.InSecondsF()
              << ", DTS=" << decode_timestamp.InSecondsF()
-             << ", DUR=" << frame_duration.InSecondsF();
+             << ", DUR=" << frame_duration.InSecondsF()
+             << ", RAP=" << frame->IsKeyframe();
 
     // Sanity check the timestamps.
     if (presentation_timestamp == kNoTimestamp()) {
       DVLOG(2) << __FUNCTION__ << ": Unknown frame PTS";
       return false;
     }
     if (decode_timestamp == kNoTimestamp()) {
       DVLOG(2) << __FUNCTION__ << ": Unknown frame DTS";
       return false;
     }
@@ skipping 151 matching lines @@
       presentation_timestamp = frame->timestamp();
 
       // The end timestamp of the frame should be unchanged.
       DCHECK(frame_end_timestamp == presentation_timestamp + frame->duration());
     }
 
     if (presentation_timestamp < append_window_start ||
         frame_end_timestamp > append_window_end) {
       track_buffer->set_needs_random_access_point(true);
       DVLOG(3) << "Dropping frame that is outside append window.";
-
-      if (!sequence_mode_) {

[acolwell GONE FROM CHROMIUM, 2014/07/08 16:32:00]

This was causing broken behavior in ChunkDemuxerTest.AppendWindow_Text. The need
for a RAP on one track buffer should not trigger new media segment behavior on
all other track buffers.

[wolenetz, 2014/07/08 19:33:53]

Ok. If enough frames are dropped such that a discontinuity is introduced, we'll
still do the new media segment triggering during steps 7.1-7.6, above.

[acolwell GONE FROM CHROMIUM, 2014/07/08 22:00:38]

Yes. I believe that is the proper place for it. I think this path was just to
make the AppendWindow_Text test happy and it appeared to be the only one that
cared that this code was removed.

-        // 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());
@@ skipping 67 matching lines @@
     DCHECK(group_end_timestamp_ >= base::TimeDelta());
 
     return true;
   }
 
   NOTREACHED();
   return false;
 }
 
 }  // namespace media