| Index: media/filters/pipeline_integration_test.cc
|
| diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
|
| index 3d70558aeb1d17e2a3db9588354670f3c10bd7d9..bce580d76fada5c541828964337f6412a171e12f 100644
|
| --- a/media/filters/pipeline_integration_test.cc
|
| +++ b/media/filters/pipeline_integration_test.cc
|
| @@ -1563,6 +1563,7 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackChainedOgg) {
|
| ASSERT_TRUE(Start(GetTestDataFilePath("double-sfx.ogg"), PIPELINE_OK));
|
| Play();
|
| ASSERT_TRUE(WaitUntilOnEnded());
|
| + ASSERT_EQ(base::TimeDelta(), demuxer_->GetStartTime());
|
| }
|
|
|
| // Ensures audio-video playback with missing or negative timestamps fails softly
|
| @@ -1571,6 +1572,7 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackChainedOggVideo) {
|
| ASSERT_TRUE(Start(GetTestDataFilePath("double-bear.ogv"), PIPELINE_OK));
|
| Play();
|
| EXPECT_EQ(PIPELINE_ERROR_DECODE, WaitUntilEndedOrError());
|
| + ASSERT_EQ(base::TimeDelta(), demuxer_->GetStartTime());
|
| }
|
|
|
| // Tests that we signal ended even when audio runs longer than video track.
|
| @@ -1595,4 +1597,13 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackAudioShorterThanVideo) {
|
| ASSERT_TRUE(WaitUntilOnEnded());
|
| }
|
|
|
| +TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
|
| + ASSERT_TRUE(
|
| + Start(GetTestDataFilePath("nonzero-start-time.webm"), PIPELINE_OK));
|
| + Play();
|
| + ASSERT_TRUE(WaitUntilOnEnded());
|
| + ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
|
| + demuxer_->GetStartTime());
|
| +}
|
| +
|
| } // namespace media
|
|
|