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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 2645953004: Update duration when demuxed packets exceed known duration. (Closed)
Patch Set: Remove broken CGI server. Rate limit duration changed events. Created 3 years, 11 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
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 0cb1ad3855aeab55ff44c322d58c751ac5b9de69..8d103107a0cc54b5c59ee3b03f589f45ad4532c8 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -834,7 +834,8 @@ class BasicMSEPlaybackTest
TEST_P(BasicPlaybackTest, PlayToEnd) {
PlaybackTestData data = GetParam();
- ASSERT_EQ(PIPELINE_OK, Start(data.filename, kClockless));
+ ASSERT_EQ(PIPELINE_OK,
+ Start(data.filename, kClockless | kUnreliableDuration));
EXPECT_EQ(data.start_time_ms, demuxer_->GetStartTime().InMilliseconds());
EXPECT_EQ(data.duration_ms, pipeline_->GetMediaDuration().InMilliseconds());
@@ -875,7 +876,7 @@ const PlaybackTestData kADTSTests[] = {
};
// TODO(chcunningham): Migrate other basic playback tests to TEST_P.
-INSTANTIATE_TEST_CASE_P(PropritaryCodecs,
+INSTANTIATE_TEST_CASE_P(ProprietaryCodecs,
BasicPlaybackTest,
testing::ValuesIn(kADTSTests));
@@ -887,7 +888,7 @@ const MSEPlaybackTestData kMediaSourceADTSTests[] = {
};
// TODO(chcunningham): Migrate other basic MSE playback tests to TEST_P.
-INSTANTIATE_TEST_CASE_P(PropritaryCodecs,
+INSTANTIATE_TEST_CASE_P(ProprietaryCodecs,
BasicMSEPlaybackTest,
testing::ValuesIn(kMediaSourceADTSTests));
@@ -2546,7 +2547,7 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_Opus441kHz) {
// Ensures audio-only playback with missing or negative timestamps works. Tests
// the common live-streaming case for chained ogg. See http://crbug.com/396864.
TEST_F(PipelineIntegrationTest, BasicPlaybackChainedOgg) {
- ASSERT_EQ(PIPELINE_OK, Start("double-sfx.ogg"));
+ ASSERT_EQ(PIPELINE_OK, Start("double-sfx.ogg", kUnreliableDuration));
Play();
ASSERT_TRUE(WaitUntilOnEnded());
ASSERT_EQ(base::TimeDelta(), demuxer_->GetStartTime());
@@ -2555,7 +2556,7 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackChainedOgg) {
// Ensures audio-video playback with missing or negative timestamps fails softly
// instead of crashing. See http://crbug.com/396864.
TEST_F(PipelineIntegrationTest, BasicPlaybackChainedOggVideo) {
- ASSERT_EQ(PIPELINE_OK, Start("double-bear.ogv"));
+ ASSERT_EQ(PIPELINE_OK, Start("double-bear.ogv", kUnreliableDuration));
Play();
EXPECT_EQ(PIPELINE_ERROR_DECODE, WaitUntilEndedOrError());
ASSERT_EQ(base::TimeDelta(), demuxer_->GetStartTime());

Powered by Google App Engine
This is Rietveld 408576698