Index: media/filters/chunk_demuxer_unittest.cc |
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc |
index 0d7c9a1c0d04b668ef4789ac40576f72dcad1290..9acfdbb3a1b3ecd9b9ab27d93106d9363ce7f505 100644 |
--- a/media/filters/chunk_demuxer_unittest.cc |
+++ b/media/filters/chunk_demuxer_unittest.cc |
@@ -165,29 +165,16 @@ MATCHER_P2(InitSegmentMismatchesMimeType, |
std::string(track_type_string_with_article) + " codec."); |
} |
-MATCHER_P2(GeneratedSplice, duration_microseconds, time_microseconds, "") { |
- return CONTAINS_STRING(arg, "Generated splice of overlap duration " + |
- base::IntToString(duration_microseconds) + |
- "us into new buffer at " + |
- base::IntToString(time_microseconds) + "us."); |
-} |
- |
-MATCHER_P2(SkippingSpliceAtOrBefore, |
- new_microseconds, |
- existing_microseconds, |
- "") { |
- return CONTAINS_STRING( |
- arg, "Skipping splice frame generation: first new buffer at " + |
- base::IntToString(new_microseconds) + |
- "us begins at or before existing buffer at " + |
- base::IntToString(existing_microseconds) + "us."); |
-} |
- |
-MATCHER_P(SkippingSpliceAlreadySpliced, time_microseconds, "") { |
- return CONTAINS_STRING( |
- arg, "Skipping splice frame generation: overlapped buffers at " + |
- base::IntToString(time_microseconds) + |
- "us are in a previously buffered splice."); |
+MATCHER_P2(GeneratedSplice, splice_time_mu, overlapped_start_mu, "") { |
+ int silence_duration = splice_time_mu - overlapped_start_mu; |
+ return CONTAINS_STRING(arg, |
+ "Generated splice for overlapping audio buffer" |
+ " at time:" + |
+ base::IntToString(splice_time_mu) + |
+ "mu. Adding silence of length:" + |
wolenetz
2016/09/15 23:47:52
s/mu/us/
chcunningham
2016/09/16 20:42:44
Done.
|
+ base::IntToString(silence_duration) + |
+ "mu to replace overlapped buffer at time:" + |
+ base::IntToString(overlapped_start_mu) + "mu."); |
} |
MATCHER_P(WebMSimpleBlockDurationEstimated, estimated_duration_ms, "") { |
@@ -278,8 +265,8 @@ class ChunkDemuxerTest : public ::testing::Test { |
base::Bind(&ChunkDemuxerTest::DemuxerOpened, base::Unretained(this)); |
Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb = base::Bind( |
&ChunkDemuxerTest::OnEncryptedMediaInitData, base::Unretained(this)); |
- demuxer_.reset(new ChunkDemuxer(open_cb, encrypted_media_init_data_cb, |
- media_log_, true)); |
+ demuxer_.reset( |
+ new ChunkDemuxer(open_cb, encrypted_media_init_data_cb, media_log_)); |
} |
virtual ~ChunkDemuxerTest() { |
@@ -972,7 +959,7 @@ class ChunkDemuxerTest : public ::testing::Test { |
// Append a media segment that goes from [0.527000, 1.014000). |
EXPECT_MEDIA_LOG(WebMSimpleBlockDurationEstimated(2)); |
- EXPECT_MEDIA_LOG(GeneratedSplice(20000, 527000)); |
+ EXPECT_MEDIA_LOG(GeneratedSplice(527000, 524000)); |
EXPECT_TRUE(AppendData(bear2->data() + 55290, 18785)); |
CheckExpectedRanges("{ [0,1027) [1201,2736) }"); |
@@ -981,7 +968,7 @@ class ChunkDemuxerTest : public ::testing::Test { |
EXPECT_CALL(*this, InitSegmentReceivedMock(_)); |
EXPECT_TRUE(AppendData(bear1->data(), 4370)); |
EXPECT_MEDIA_LOG(WebMSimpleBlockDurationEstimated(23)); |
- EXPECT_MEDIA_LOG(GeneratedSplice(26000, 779000)); |
+ EXPECT_MEDIA_LOG(GeneratedSplice(779000, 759000)); |
EXPECT_TRUE(AppendData(bear1->data() + 72737, 28183)); |
CheckExpectedRanges("{ [0,2736) }"); |
@@ -1840,17 +1827,17 @@ TEST_F(ChunkDemuxerTest, Read) { |
TEST_F(ChunkDemuxerTest, OutOfOrderClusters) { |
ASSERT_TRUE(InitDemuxer(HAS_AUDIO | HAS_VIDEO)); |
ASSERT_TRUE(AppendCluster(kDefaultFirstCluster())); |
- EXPECT_MEDIA_LOG(GeneratedSplice(13000, 10000)); |
+ EXPECT_MEDIA_LOG(GeneratedSplice(10000, 0)); |
ASSERT_TRUE(AppendCluster(GenerateCluster(10, 4))); |
// Make sure that AppendCluster() does not fail with a cluster that has |
// overlaps with the previously appended cluster. |
- EXPECT_MEDIA_LOG(SkippingSpliceAlreadySpliced(0)); |
+ EXPECT_MEDIA_LOG(GeneratedSplice(5000, 0)); |
ASSERT_TRUE(AppendCluster(GenerateCluster(5, 4))); |
// Verify that AppendData() can still accept more data. |
+ EXPECT_MEDIA_LOG(GeneratedSplice(45000, 28000)); |
std::unique_ptr<Cluster> cluster_c(GenerateCluster(45, 2)); |
- EXPECT_MEDIA_LOG(GeneratedSplice(6000, 45000)); |
ASSERT_TRUE(demuxer_->AppendData( |
kSourceId, cluster_c->data(), cluster_c->size(), |
append_window_start_for_next_append_, append_window_end_for_next_append_, |
@@ -2183,7 +2170,6 @@ TEST_F(ChunkDemuxerTest, EndOfStreamRangeChanges) { |
// Add text track data and verify that the buffered ranges don't change |
// since the intersection of all the tracks doesn't change. |
- EXPECT_MEDIA_LOG(SkippingSpliceAtOrBefore(0, 0)); |
EXPECT_CALL(host_, SetDuration(base::TimeDelta::FromMilliseconds(200))); |
AppendMuxedCluster(MuxedStreamInfo(kVideoTrackNum, "0K 33", 33), |
MuxedStreamInfo(kAudioTrackNum, "0K 23K", 23), |
@@ -2893,16 +2879,21 @@ TEST_F(ChunkDemuxerTest, GetBufferedRanges_SeparateStreams) { |
CheckExpectedRangesForMediaSource( |
"{ [0,23) [320,400) [520,570) [720,750) [920,950) }"); |
- // Appending within buffered range should not affect buffered ranges. |
- EXPECT_MEDIA_LOG(GeneratedSplice(40000, 930000)); |
+ // Audio buffered ranges are trimmed from 970 to 950 due to splicing the |
+ // previously buffered audio frame (now silence from [900-930), newly |
+ // appended audio from [930, 950) |
+ EXPECT_MEDIA_LOG(GeneratedSplice(930000, 900000)); |
ASSERT_TRUE(AppendCluster( |
audio_id, GenerateSingleStreamCluster(930, 950, kAudioTrackNum, 20))); |
+ CheckExpectedRanges(DemuxerStream::AUDIO, |
+ "{ [0,23) [300,400) [520,590) [720,750) [900,950) }"); |
+ |
+ // Appending within buffered range should not affect video buffered ranges. |
ASSERT_TRUE(AppendCluster( |
video_id, GenerateSingleStreamCluster(930, 950, kVideoTrackNum, 20))); |
- CheckExpectedRanges(DemuxerStream::AUDIO, |
- "{ [0,23) [300,400) [520,590) [720,750) [900,970) }"); |
CheckExpectedRanges(DemuxerStream::VIDEO, |
"{ [0,33) [320,420) [500,570) [700,770) [920,950) }"); |
+ |
CheckExpectedRangesForMediaSource( |
"{ [0,23) [320,400) [520,570) [720,750) [920,950) }"); |
} |
@@ -2974,14 +2965,19 @@ TEST_F(ChunkDemuxerTest, GetBufferedRanges_AudioVideo) { |
"{ [0,33) [300,420) [500,570) [700,770) [900,950) }"); |
CheckExpectedRanges("{ [0,23) [300,400) [500,570) [700,750) [900,950) }"); |
- // Appending within buffered range should not affect buffered ranges. |
- EXPECT_MEDIA_LOG(GeneratedSplice(40000, 930000)); |
+ // Appending within buffered range should not affect video buffered ranges. |
+ EXPECT_MEDIA_LOG(GeneratedSplice(930000, 900000)); |
AppendMuxedCluster(MuxedStreamInfo(kAudioTrackNum, "930D20K"), |
MuxedStreamInfo(kVideoTrackNum, "930D20K")); |
- CheckExpectedRanges(DemuxerStream::AUDIO, |
- "{ [0,23) [300,400) [500,590) [700,750) [900,970) }"); |
CheckExpectedRanges(DemuxerStream::VIDEO, |
"{ [0,33) [300,420) [500,570) [700,770) [900,950) }"); |
+ |
+ // Audio buffered ranges are trimmed from 970 to 950 due to splicing the |
+ // previously buffered audio frame - now silence from [900-930), newly |
+ // appended audio from [930, 950). |
+ CheckExpectedRanges(DemuxerStream::AUDIO, |
+ "{ [0,23) [300,400) [500,590) [700,750) [900,950) }"); |
+ |
CheckExpectedRanges("{ [0,23) [300,400) [500,570) [700,750) [900,950) }"); |
} |
@@ -3321,11 +3317,10 @@ TEST_F(ChunkDemuxerTest, ConfigChange_Audio) { |
ExpectRead(DemuxerStream::AUDIO, 0); |
- // The first config change seen is from a splice frame representing an overlap |
- // of buffer from config 1 by buffers from config 2. |
+ // Read until we encounter config 2. |
ReadUntilNotOkOrEndOfStream(DemuxerStream::AUDIO, &status, &last_timestamp); |
ASSERT_EQ(status, DemuxerStream::kConfigChanged); |
- EXPECT_EQ(last_timestamp.InMilliseconds(), 524); |
+ EXPECT_EQ(last_timestamp.InMilliseconds(), 501); |
// Fetch the new decoder config. |
const AudioDecoderConfig& audio_config_2 = audio->audio_decoder_config(); |
@@ -3333,11 +3328,10 @@ TEST_F(ChunkDemuxerTest, ConfigChange_Audio) { |
EXPECT_EQ(audio_config_2.samples_per_second(), 44100); |
EXPECT_EQ(audio_config_2.extra_data().size(), 3935u); |
- // The next config change is from a splice frame representing an overlap of |
- // buffers from config 2 by buffers from config 1. |
+ // Read until we encounter config 1 again. |
ReadUntilNotOkOrEndOfStream(DemuxerStream::AUDIO, &status, &last_timestamp); |
ASSERT_EQ(status, DemuxerStream::kConfigChanged); |
- EXPECT_EQ(last_timestamp.InMilliseconds(), 782); |
+ EXPECT_EQ(last_timestamp.InMilliseconds(), 736); |
ASSERT_TRUE(audio_config_1.Matches(audio->audio_decoder_config())); |
// Read until the end of the stream just to make sure there aren't any other |
@@ -3638,7 +3632,7 @@ TEST_F(ChunkDemuxerTest, WebMIsParsingMediaSegmentDetection) { |
ASSERT_TRUE(InitDemuxer(HAS_AUDIO)); |
EXPECT_MEDIA_LOG(WebMSimpleBlockDurationEstimated(23)).Times(2); |
- EXPECT_MEDIA_LOG(GeneratedSplice(22000, 2000)); |
+ EXPECT_MEDIA_LOG(GeneratedSplice(2000, 1000)); |
for (size_t i = 0; i < sizeof(kBuffer); i++) { |
DVLOG(3) << "Appending and testing index " << i; |
ASSERT_TRUE(AppendData(kBuffer + i, 1)); |