| Index: media/filters/pipeline_integration_test.cc
|
| diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
|
| index 9693af96c01b9104bd961db4bd37a4dd2395ad96..a77b286e552e8df4ed57caf79232cf26112d7491 100644
|
| --- a/media/filters/pipeline_integration_test.cc
|
| +++ b/media/filters/pipeline_integration_test.cc
|
| @@ -512,7 +512,10 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackEncrypted) {
|
| Stop();
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_MediaSource) {
|
| MockMediaSource source("bear-320x240.webm", kWebM, 219229);
|
| StartPipelineWithMediaSource(&source);
|
| source.EndOfStream();
|
| @@ -529,7 +532,10 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
|
| Stop();
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VP9_WebM) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_MediaSource_VP9_WebM) {
|
| MockMediaSource source("bear-vp9.webm", kWebMVP9, 67504);
|
| StartPipelineWithMediaSource(&source);
|
| source.EndOfStream();
|
| @@ -546,7 +552,10 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VP9_WebM) {
|
| Stop();
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VP8A_WebM) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_MediaSource_VP8A_WebM) {
|
| EXPECT_CALL(*this, OnSetOpaque(false)).Times(AnyNumber());
|
| MockMediaSource source("bear-vp8a.webm", kVideoOnlyWebM, kAppendWholeFile);
|
| StartPipelineWithMediaSource(&source);
|
| @@ -564,7 +573,10 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VP8A_WebM) {
|
| Stop();
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_Opus_WebM) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_MediaSource_Opus_WebM) {
|
| EXPECT_CALL(*this, OnSetOpaque(false)).Times(AnyNumber());
|
| MockMediaSource source("bear-opus-end-trimming.webm", kOpusAudioOnlyWebM,
|
| kAppendWholeFile);
|
| @@ -620,7 +632,10 @@ TEST_F(PipelineIntegrationTest, DISABLED_MediaSource_Opus_Seeking_WebM) {
|
| Stop();
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_WebM) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_MediaSource_ConfigChange_WebM) {
|
| MockMediaSource source("bear-320x240-16x9-aspect.webm", kWebM,
|
| kAppendWholeFile);
|
| StartPipelineWithMediaSource(&source);
|
| @@ -645,7 +660,11 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_WebM) {
|
| Stop();
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_Encrypted_WebM) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest,
|
| + DISABLED_MediaSource_ConfigChange_Encrypted_WebM) {
|
| MockMediaSource source("bear-320x240-16x9-aspect-av_enc-av.webm", kWebM,
|
| kAppendWholeFile);
|
| FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
|
| @@ -672,8 +691,11 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_Encrypted_WebM) {
|
| }
|
|
|
| // Config changes from encrypted to clear are not currently supported.
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| TEST_F(PipelineIntegrationTest,
|
| - MediaSource_ConfigChange_ClearThenEncrypted_WebM) {
|
| + DISABLED_MediaSource_ConfigChange_ClearThenEncrypted_WebM) {
|
| MockMediaSource source("bear-320x240-16x9-aspect.webm", kWebM,
|
| kAppendWholeFile);
|
| FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
|
| @@ -703,8 +725,11 @@ TEST_F(PipelineIntegrationTest,
|
| }
|
|
|
| // Config changes from clear to encrypted are not currently supported.
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| TEST_F(PipelineIntegrationTest,
|
| - MediaSource_ConfigChange_EncryptedThenClear_WebM) {
|
| + DISABLED_MediaSource_ConfigChange_EncryptedThenClear_WebM) {
|
| MockMediaSource source("bear-320x240-16x9-aspect-av_enc-av.webm", kWebM,
|
| kAppendWholeFile);
|
| FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
|
| @@ -941,7 +966,10 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) {
|
| ASSERT_TRUE(WaitUntilOnEnded());
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, EncryptedPlayback_WebM) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback_WebM) {
|
| MockMediaSource source("bear-320x240-av_enc-av.webm", kWebM, 219816);
|
| FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
|
| StartPipelineWithEncryptedMedia(&source, &encrypted_media);
|
| @@ -956,7 +984,10 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_WebM) {
|
| Stop();
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, EncryptedPlayback_ClearStart_WebM) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback_ClearStart_WebM) {
|
| MockMediaSource source("bear-320x240-av_enc-av_clear-1s.webm",
|
| kWebM, kAppendWholeFile);
|
| FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
|
| @@ -972,7 +1003,10 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_ClearStart_WebM) {
|
| Stop();
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, EncryptedPlayback_NoEncryptedFrames_WebM) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback_NoEncryptedFrames_WebM) {
|
| MockMediaSource source("bear-320x240-av_enc-av_clear-all.webm",
|
| kWebM, kAppendWholeFile);
|
| FakeEncryptedMedia encrypted_media(new NoResponseApp());
|
| @@ -1055,7 +1089,12 @@ TEST_F(PipelineIntegrationTest,
|
| Stop();
|
| }
|
|
|
| -TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VideoOnly_MP4_AVC3) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once MP4 stream parser (or the
|
| +// underlying file) fixed to emit frames whose decode timestamps NEVER exceed
|
| +// presentation timestamp. See http://crbug.com/354518.
|
| +TEST_F(PipelineIntegrationTest,
|
| + DISABLED_BasicPlayback_MediaSource_VideoOnly_MP4_AVC3) {
|
| MockMediaSource source("bear-1280x720-v_frag-avc3.mp4", kMP4VideoAVC3,
|
| kAppendWholeFile);
|
| StartPipelineWithMediaSource(&source);
|
| @@ -1120,7 +1159,10 @@ TEST_F(PipelineIntegrationTest, DISABLED_SeekWhilePlaying) {
|
| }
|
|
|
| // Verify audio decoder & renderer can handle aborted demuxer reads.
|
| -TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_AudioOnly) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_ChunkDemuxerAbortRead_AudioOnly) {
|
| ASSERT_TRUE(TestSeekDuringRead("bear-320x240-audio-only.webm", kAudioOnlyWebM,
|
| 8192,
|
| base::TimeDelta::FromMilliseconds(464),
|
| @@ -1129,7 +1171,10 @@ TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_AudioOnly) {
|
| }
|
|
|
| // Verify video decoder & renderer can handle aborted demuxer reads.
|
| -TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
|
| +// TODO(acolwell/wolenetz): Re-enable for use with compliant coded frame
|
| +// processor (see http://crbug.com/249422) once WebM stream parser fixed to
|
| +// always emit frames with valid durations (see http://crbug.com/351166).
|
| +TEST_F(PipelineIntegrationTest, DISABLED_ChunkDemuxerAbortRead_VideoOnly) {
|
| ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM,
|
| 32768,
|
| base::TimeDelta::FromMilliseconds(200),
|
|
|