| Index: media/test/pipeline_integration_perftest.cc
|
| diff --git a/media/test/pipeline_integration_perftest.cc b/media/test/pipeline_integration_perftest.cc
|
| index e09de39ee8fead784cd577c98655aa45b67539a3..a1023ace2465d11c6087100aa929cf69a93e48bd 100644
|
| --- a/media/test/pipeline_integration_perftest.cc
|
| +++ b/media/test/pipeline_integration_perftest.cc
|
| @@ -75,12 +75,16 @@ TEST(PipelineIntegrationPerfTest, VP9PlaybackBenchmark) {
|
| RunVideoPlaybackBenchmark("bear-vp9.webm", "clockless_video_playback_vp9");
|
| }
|
|
|
| +// Android doesn't build Theora support.
|
| +#if !defined(OS_ANDROID)
|
| TEST(PipelineIntegrationPerfTest, TheoraPlaybackBenchmark) {
|
| RunVideoPlaybackBenchmark("bear_silent.ogv",
|
| "clockless_video_playback_theora");
|
| }
|
| +#endif
|
|
|
| -#if defined(USE_PROPRIETARY_CODECS)
|
| +// PipelineIntegrationTests can't play h264 content.
|
| +#if defined(USE_PROPRIETARY_CODECS) && !defined(OS_ANDROID)
|
| TEST(PipelineIntegrationPerfTest, MP4PlaybackBenchmark) {
|
| RunVideoPlaybackBenchmark("bear_silent.mp4", "clockless_video_playback_mp4");
|
| }
|
|
|