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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/test_data_util.h" 5 #include "media/base/test_data_util.h"
6 #include "media/test/pipeline_integration_test_base.h" 6 #include "media/test/pipeline_integration_test_base.h"
7 #include "testing/perf/perf_test.h" 7 #include "testing/perf/perf_test.h"
8 8
9 namespace media { 9 namespace media {
10 10
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 68 }
69 69
70 TEST(PipelineIntegrationPerfTest, VP8PlaybackBenchmark) { 70 TEST(PipelineIntegrationPerfTest, VP8PlaybackBenchmark) {
71 RunVideoPlaybackBenchmark("bear_silent.webm", "clockless_video_playback_vp8"); 71 RunVideoPlaybackBenchmark("bear_silent.webm", "clockless_video_playback_vp8");
72 } 72 }
73 73
74 TEST(PipelineIntegrationPerfTest, VP9PlaybackBenchmark) { 74 TEST(PipelineIntegrationPerfTest, VP9PlaybackBenchmark) {
75 RunVideoPlaybackBenchmark("bear-vp9.webm", "clockless_video_playback_vp9"); 75 RunVideoPlaybackBenchmark("bear-vp9.webm", "clockless_video_playback_vp9");
76 } 76 }
77 77
78 // Android doesn't build Theora support.
79 #if !defined(OS_ANDROID)
78 TEST(PipelineIntegrationPerfTest, TheoraPlaybackBenchmark) { 80 TEST(PipelineIntegrationPerfTest, TheoraPlaybackBenchmark) {
79 RunVideoPlaybackBenchmark("bear_silent.ogv", 81 RunVideoPlaybackBenchmark("bear_silent.ogv",
80 "clockless_video_playback_theora"); 82 "clockless_video_playback_theora");
81 } 83 }
84 #endif
82 85
83 #if defined(USE_PROPRIETARY_CODECS) 86 // PipelineIntegrationTests can't play h264 content.
87 #if defined(USE_PROPRIETARY_CODECS) && !defined(OS_ANDROID)
84 TEST(PipelineIntegrationPerfTest, MP4PlaybackBenchmark) { 88 TEST(PipelineIntegrationPerfTest, MP4PlaybackBenchmark) {
85 RunVideoPlaybackBenchmark("bear_silent.mp4", "clockless_video_playback_mp4"); 89 RunVideoPlaybackBenchmark("bear_silent.mp4", "clockless_video_playback_mp4");
86 } 90 }
87 #endif 91 #endif
88 92
89 } // namespace media 93 } // namespace media
OLDNEW
« 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