Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(458)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/test/pipeline_integration_test.cc

Issue 1999893004: Splits PipelineImpl into main and media thread components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: restores posting stop done_cb Created 4 years, 6 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
Download patch
« no previous file with comments | « media/formats/webm/webm_stream_parser_unittest.cc ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 9dd4b907e134e3c3bc47b22ad9f8db559229b707..8bc60d75657c36b9a8ba9811f0a0b67243057350 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -1203,17 +1203,16 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_WebM) {
ReadTestDataFile("bear-640x360.webm");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
second_file->data(), second_file->data_size());
-
source.EndOfStream();
+ Play();
+ EXPECT_TRUE(WaitUntilOnEnded());
+
EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
EXPECT_EQ(kAppendTimeMs + k640WebMFileDurationMs,
pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
- Play();
-
- EXPECT_TRUE(WaitUntilOnEnded());
source.Shutdown();
Stop();
}
@@ -1230,6 +1229,8 @@ TEST_F(PipelineIntegrationTest, MediaSource_Remove_Updates_BufferedRanges) {
source.RemoveRange(base::TimeDelta::FromMilliseconds(1000),
base::TimeDelta::FromMilliseconds(k320WebMFileDurationMs));
+ message_loop_.RunUntilIdle();
+
buffered_ranges = pipeline_->GetBufferedTimeRanges();
EXPECT_EQ(1u, buffered_ranges.size());
EXPECT_EQ(0, buffered_ranges.start(0).InMilliseconds());
@@ -1263,6 +1264,8 @@ TEST_F(PipelineIntegrationTest, MediaSource_FillUp_Buffer) {
// reached (the data will be evicted from the front of the buffered range).
source.EvictCodedFrames(media_time, file->data_size());
source.AppendAtTime(media_time, file->data(), file->data_size());
+ message_loop_.RunUntilIdle();
+
buffered_ranges = pipeline_->GetBufferedTimeRanges();
} while (buffered_ranges.size() == 1 &&
buffered_ranges.start(0) == base::TimeDelta::FromSeconds(0));
@@ -1284,17 +1287,16 @@ TEST_F(PipelineIntegrationTest,
ReadTestDataFile("bear-640x360-av_enc-av.webm");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
second_file->data(), second_file->data_size());
-
source.EndOfStream();
+ Play();
+ EXPECT_TRUE(WaitUntilOnEnded());
+
EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
EXPECT_EQ(kAppendTimeMs + k640WebMFileDurationMs,
pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
- Play();
-
- EXPECT_TRUE(WaitUntilOnEnded());
source.Shutdown();
Stop();
}
@@ -1400,15 +1402,14 @@ TEST_F(PipelineIntegrationTest, MediaSource_ADTS_TimestampOffset) {
second_file->data(), second_file->data_size());
source.EndOfStream();
+ Play();
+ EXPECT_TRUE(WaitUntilOnEnded());
+
EXPECT_EQ(592, source.last_timestamp_offset().InMilliseconds());
EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
EXPECT_EQ(592, pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
- Play();
-
- EXPECT_TRUE(WaitUntilOnEnded());
-
// Verify preroll is stripped.
EXPECT_HASH_EQ("-0.06,0.97,-0.90,-0.70,-0.53,-0.34,", GetAudioHash());
}
@@ -1532,14 +1533,13 @@ TEST_F(PipelineIntegrationTest, MediaSource_MP3_TimestampOffset) {
second_file->data_size());
source.EndOfStream();
+ Play();
+ EXPECT_TRUE(WaitUntilOnEnded());
+
EXPECT_EQ(613, source.last_timestamp_offset().InMilliseconds());
EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
EXPECT_EQ(613, pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
-
- Play();
-
- EXPECT_TRUE(WaitUntilOnEnded());
}
TEST_F(PipelineIntegrationTest, MediaSource_MP3_Icecast) {
@@ -1561,17 +1561,16 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_MP4) {
ReadTestDataFile("bear-1280x720-av_frag.mp4");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
second_file->data(), second_file->data_size());
-
source.EndOfStream();
+ Play();
+ EXPECT_TRUE(WaitUntilOnEnded());
+
EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
EXPECT_EQ(kAppendTimeMs + k1280IsoFileDurationMs,
pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
- Play();
-
- EXPECT_TRUE(WaitUntilOnEnded());
source.Shutdown();
Stop();
}
@@ -1588,17 +1587,16 @@ TEST_F(PipelineIntegrationTest,
ReadTestDataFile("bear-1280x720-v_frag-cenc.mp4");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
second_file->data(), second_file->data_size());
-
source.EndOfStream();
+ Play();
+ EXPECT_TRUE(WaitUntilOnEnded());
+
EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
EXPECT_EQ(kAppendTimeMs + k1280IsoFileDurationMs,
pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
- Play();
-
- EXPECT_TRUE(WaitUntilOnEnded());
source.Shutdown();
Stop();
}
@@ -1616,17 +1614,16 @@ TEST_F(PipelineIntegrationTest,
ReadTestDataFile("bear-1280x720-v_frag-cenc-key_rotation.mp4");
source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
second_file->data(), second_file->data_size());
-
source.EndOfStream();
+ Play();
+ EXPECT_TRUE(WaitUntilOnEnded());
+
EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
EXPECT_EQ(kAppendTimeMs + k1280IsoFileDurationMs,
pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
- Play();
-
- EXPECT_TRUE(WaitUntilOnEnded());
source.Shutdown();
Stop();
}
« no previous file with comments | « media/formats/webm/webm_stream_parser_unittest.cc ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698