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

Unified Diff: media/test/pipeline_integration_perftest.cc

Issue 2066943002: Fix media_perftests to run on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Typos. 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/test/BUILD.gn ('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_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");
}
« no previous file with comments | « media/test/BUILD.gn ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698