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

Side by Side Diff: media/test/pipeline_integration_test_base.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/pipeline_integration_perftest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test/pipeline_integration_test_base.h" 5 #include "media/test/pipeline_integration_test_base.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 tracks_updated_cb, new MediaLog())); 278 tracks_updated_cb, new MediaLog()));
279 #endif 279 #endif
280 } 280 }
281 281
282 std::unique_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() { 282 std::unique_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() {
283 ScopedVector<VideoDecoder> video_decoders; 283 ScopedVector<VideoDecoder> video_decoders;
284 #if !defined(MEDIA_DISABLE_LIBVPX) 284 #if !defined(MEDIA_DISABLE_LIBVPX)
285 video_decoders.push_back(new VpxVideoDecoder()); 285 video_decoders.push_back(new VpxVideoDecoder());
286 #endif // !defined(MEDIA_DISABLE_LIBVPX) 286 #endif // !defined(MEDIA_DISABLE_LIBVPX)
287 287
288 #if !defined(MEDIA_DISABLE_FFMPEG) 288 // Android does not have an ffmpeg video decoder.
289 #if !defined(MEDIA_DISABLE_FFMPEG) && !defined(OS_ANDROID)
289 video_decoders.push_back(new FFmpegVideoDecoder()); 290 video_decoders.push_back(new FFmpegVideoDecoder());
290 #endif 291 #endif
291 292
292 // Simulate a 60Hz rendering sink. 293 // Simulate a 60Hz rendering sink.
293 video_sink_.reset(new NullVideoSink( 294 video_sink_.reset(new NullVideoSink(
294 clockless_playback_, base::TimeDelta::FromSecondsD(1.0 / 60), 295 clockless_playback_, base::TimeDelta::FromSecondsD(1.0 / 60),
295 base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint, 296 base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint,
296 base::Unretained(this)), 297 base::Unretained(this)),
297 message_loop_.task_runner())); 298 message_loop_.task_runner()));
298 299
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 DCHECK(clockless_playback_); 383 DCHECK(clockless_playback_);
383 return clockless_audio_sink_->render_time(); 384 return clockless_audio_sink_->render_time();
384 } 385 }
385 386
386 base::TimeTicks DummyTickClock::NowTicks() { 387 base::TimeTicks DummyTickClock::NowTicks() {
387 now_ += base::TimeDelta::FromSeconds(60); 388 now_ += base::TimeDelta::FromSeconds(60);
388 return now_; 389 return now_;
389 } 390 }
390 391
391 } // namespace media 392 } // namespace media
OLDNEW
« no previous file with comments | « media/test/pipeline_integration_perftest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698