Add support for partial append window end trimming.

media/filters/chunk_demuxer_unittest.cc

Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 0bb3ecc5e4978eb7cb5e29f67fb9c45d4b8b8c19..fb74245f052f16cf8159425b806a7bab51086910 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -458,6 +458,9 @@ class ChunkDemuxerTest : public ::testing::Test {
             << " All text blocks must be keyframes";
       }
 
+      if (track_number == kAudioTrackNum)
+        block_info.flags = kWebMFlagKeyframe;

[wolenetz, 2014/07/25 22:33:03]

nit: assert that block_info.flags == kWebMFlagKeyframe here, rather than
implicitly setting this flag, to make it obvious to test maintainers that (test)
audio streams must consist entirely of key frames. Also, perhaps document this
restriction in method's comment.

[DaleCurtis, 2014/07/29 01:35:10]

Looking at this again it looks like only a few tests need fixup, so I've gone
ahead and fixed them and added the assert here.

+
       blocks->push_back(block_info);
     }
   }
@@ -1370,19 +1373,19 @@ TEST_F(ChunkDemuxerTest, InitSegmentSetsNeedRandomAccessPointFlag) {
   ASSERT_TRUE(audio_stream && video_stream && text_stream);
 
   AppendMuxedCluster(
-      MuxedStreamInfo(kAudioTrackNum, "0 23K"),
+      MuxedStreamInfo(kAudioTrackNum, "23K 43K"),

[acolwell GONE FROM CHROMIUM, 2014/07/24 19:22:14]

do you actually need this second buffer? Ideally it would be nice to not have
this buffer overlap with the one added below just like the original test.

[DaleCurtis, 2014/07/29 01:35:10]

Done.

       MuxedStreamInfo(kVideoTrackNum, "0 30K"),
       MuxedStreamInfo(kTextTrackNum, "25K 40K"));
-  CheckExpectedRanges(kSourceId, "{ [23,46) }");
+  CheckExpectedRanges(kSourceId, "{ [23,60) }");
 
   AppendInitSegment(HAS_TEXT | HAS_AUDIO | HAS_VIDEO);
   AppendMuxedCluster(
-      MuxedStreamInfo(kAudioTrackNum, "46 69K"),
+      MuxedStreamInfo(kAudioTrackNum, "46K 69K"),
       MuxedStreamInfo(kVideoTrackNum, "60 90K"),
       MuxedStreamInfo(kTextTrackNum, "80K 90K"));
   CheckExpectedRanges(kSourceId, "{ [23,92) }");
 
-  CheckExpectedBuffers(audio_stream, "23 69");
+  CheckExpectedBuffers(audio_stream, "23 43");

[acolwell GONE FROM CHROMIUM, 2014/07/24 19:22:15]

This should include buffers from the second append just like the original code
did. Assuming you removed the 43 from avove, I'd expect you to be able to make
this "23 46 69". If that doesn't work, it would be nice to know why.

[DaleCurtis, 2014/07/29 01:35:10]

Done.

   CheckExpectedBuffers(video_stream, "30 90");
   CheckExpectedBuffers(text_stream, "25 40 80 90");
 }
@@ -3356,7 +3359,7 @@ TEST_F(ChunkDemuxerTest, AppendWindow_Audio) {
   //
   // The first 50ms of the range should be truncated since it overlaps
   // the start of the append window.
-  CheckExpectedRanges(kSourceId, "{ [50,270) }");
+  CheckExpectedRanges(kSourceId, "{ [50,280) }");
 
   // The "50P" buffer is the "0" buffer marked for complete discard.  The next
   // "50" buffer is the "30" buffer marked with 20ms of start discard.
@@ -3369,7 +3372,7 @@ TEST_F(ChunkDemuxerTest, AppendWindow_Audio) {
   AppendSingleStreamCluster(
       kSourceId, kAudioTrackNum,
       "360K 390K 420K 450K 480K 510K 540K 570K 600K 630K");
-  CheckExpectedRanges(kSourceId, "{ [50,270) [360,630) }");
+  CheckExpectedRanges(kSourceId, "{ [50,280) [360,650) }");
 }
 
 TEST_F(ChunkDemuxerTest, AppendWindow_AudioOverlapStartAndEnd) {
@@ -3382,9 +3385,8 @@ TEST_F(ChunkDemuxerTest, AppendWindow_AudioOverlapStartAndEnd) {
   // Append a cluster that starts before and ends after the append window.
   AppendSingleStreamCluster(kSourceId, kAudioTrackNum, "0K");
 
-  // Verify that everything is dropped in this case.  No partial append should
-  // be generated.
-  CheckExpectedRanges(kSourceId, "{ }");
+  // Verify the append is clipped to the append window.
+  CheckExpectedRanges(kSourceId, "{ [10,20) }");
 }
 
 TEST_F(ChunkDemuxerTest, AppendWindow_WebMFile_AudioOnly) {