Chromium Code Reviews| Index: media/filters/chunk_demuxer_unittest.cc |
| diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc |
| index 475ac39d0a3c2a5748c005324d20b3ce89810c8f..8d88b854f81ac82c12743486b8298aed0905b5dd 100644 |
| --- a/media/filters/chunk_demuxer_unittest.cc |
| +++ b/media/filters/chunk_demuxer_unittest.cc |
| @@ -551,6 +551,7 @@ class ChunkDemuxerTest : public testing::Test { |
| // time ranges. |
| // bear-320x240.webm : [0-524) [779-2737) |
| // bear-640x360.webm : [527-759) |
| + |
| bool InitDemuxerWithConfigChangeData() { |
| scoped_refptr<DecoderBuffer> bear1 = ReadTestDataFile("bear-320x240.webm"); |
| scoped_refptr<DecoderBuffer> bear2 = ReadTestDataFile("bear-640x360.webm"); |
| @@ -565,7 +566,11 @@ class ChunkDemuxerTest : public testing::Test { |
| // Append the whole bear1 file. |
| AppendData(bear1->data(), bear1->data_size()); |
| - CheckExpectedRanges(kSourceId, "{ [0,2737) }"); |
| + // Last audio frame has timestamp 2721 and duration 24 (estimated from max |
| + // seen so far for audio track). |
| + // Last video frame has timestamp 2703 and duration 33 (from TrackEntry |
| + // DefaultDuration for video track). |
| + CheckExpectedRanges(kSourceId, "{ [0,2736) }"); |
|
acolwell GONE FROM CHROMIUM
2014/03/26 23:32:04
nit: update values in comment above.
wolenetz
2014/03/27 18:01:48
Done.
|
| // Append initialization segment for bear2. |
| // Note: Offsets here and below are derived from |
| @@ -577,13 +582,13 @@ class ChunkDemuxerTest : public testing::Test { |
| // Append a media segment that goes from [0.527000, 1.014000). |
| AppendData(bear2->data() + 55290, 18785); |
| - CheckExpectedRanges(kSourceId, "{ [0,1028) [1201,2737) }"); |
| + CheckExpectedRanges(kSourceId, "{ [0,1027) [1201,2736) }"); |
| // Append initialization segment for bear1 & fill gap with [779-1197) |
| // segment. |
| AppendData(bear1->data(), 4370); |
| AppendData(bear1->data() + 72737, 28183); |
| - CheckExpectedRanges(kSourceId, "{ [0,2737) }"); |
| + CheckExpectedRanges(kSourceId, "{ [0,2736) }"); |
| MarkEndOfStream(PIPELINE_OK); |
| return true; |