media/filters/chunk_demuxer_unittest.cc - Issue 2343543002: MSE: Replace crossfade splicing overlap trimming.

Unified Diff: media/filters/chunk_demuxer_unittest.cc

Issue 2343543002: MSE: Replace crossfade splicing overlap trimming. (Closed)

Patch Set: No more silence, just trim the overlap. Created 4 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

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..891b4ad99a12639c9a48f825a0dc69b659366b85 100644

--- a/media/filters/chunk_demuxer_unittest.cc

+++ b/media/filters/chunk_demuxer_unittest.cc

@@ -165,30 +165,18 @@ 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,

+MATCHER_P3(TrimmedSpliceOverlap,

+ splice_time_us,

+ overlapped_start_us,

+ trim_duration_us,

"") {

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.");

+ arg, "Audio buffer splice at PTS=" + base::IntToString(splice_time_us) +

+ "us. Trimmed tail of overlapped buffer (PTS=" +

+ base::IntToString(overlapped_start_us) + "us) by " +

+ base::IntToString(trim_duration_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_P(WebMSimpleBlockDurationEstimated, estimated_duration_ms, "") {

return CONTAINS_STRING(arg, "Estimating WebM block duration to be " +

@@ -278,8 +266,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 +960,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(TrimmedSpliceOverlap(527000, 524000, 20000));

EXPECT_TRUE(AppendData(bear2->data() + 55290, 18785));

CheckExpectedRanges("{ [0,1027) [1201,2736) }");

@@ -981,7 +969,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(TrimmedSpliceOverlap(779000, 759000, 3000));

EXPECT_TRUE(AppendData(bear1->data() + 72737, 28183));

CheckExpectedRanges("{ [0,2736) }");

@@ -1840,17 +1828,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(TrimmedSpliceOverlap(10000, 0, 13000));

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(TrimmedSpliceOverlap(5000, 0, 5000));

ASSERT_TRUE(AppendCluster(GenerateCluster(5, 4)));

// Verify that AppendData() can still accept more data.

std::unique_ptr<Cluster> cluster_c(GenerateCluster(45, 2));

- EXPECT_MEDIA_LOG(GeneratedSplice(6000, 45000));

+ EXPECT_MEDIA_LOG(TrimmedSpliceOverlap(45000, 28000, 6000));

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 +2171,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 +2880,22 @@ 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

+ // - existing frame trimmed from [900, 970) to [900-930),

+ // - newly appended audio from [930, 950).

+ EXPECT_MEDIA_LOG(TrimmedSpliceOverlap(930000, 900000, 40000));

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 +2967,20 @@ 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(TrimmedSpliceOverlap(930000, 900000, 40000));

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.

+ // - existing frame trimmed from [900, 970) to [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,8 +3320,7 @@ 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);

@@ -3333,11 +3331,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(), 759);

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 +3635,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(TrimmedSpliceOverlap(2000, 1000, 22000));

for (size_t i = 0; i < sizeof(kBuffer); i++) {

DVLOG(3) << "Appending and testing index " << i;

ASSERT_TRUE(AppendData(kBuffer + i, 1));

« no previous file with comments | « media/filters/chunk_demuxer.cc ('k') | media/filters/frame_processor_unittest.cc » ('j') | media/filters/source_buffer_stream.cc » ('J')