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

Side by Side Diff: media/test/pipeline_integration_test_base.cc

Issue 1133563010: Add a GpuMemoryBuffer pool that creates hardware backed VideoFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address reveman@'s nits. Created 5 years, 7 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
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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "media/base/cdm_context.h" 9 #include "media/base/cdm_context.h"
10 #include "media/base/media_log.h" 10 #include "media/base/media_log.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 // Simulate a 60Hz rendering sink. 240 // Simulate a 60Hz rendering sink.
241 video_sink_.reset(new NullVideoSink( 241 video_sink_.reset(new NullVideoSink(
242 clockless_playback_, base::TimeDelta::FromSecondsD(1.0 / 60), 242 clockless_playback_, base::TimeDelta::FromSecondsD(1.0 / 60),
243 base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint, 243 base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint,
244 base::Unretained(this)), 244 base::Unretained(this)),
245 message_loop_.task_runner())); 245 message_loop_.task_runner()));
246 246
247 // Disable frame dropping if hashing is enabled. 247 // Disable frame dropping if hashing is enabled.
248 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl( 248 scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
249 message_loop_.message_loop_proxy(), video_sink_.get(), 249 message_loop_.message_loop_proxy(), video_sink_.get(),
250 video_decoders.Pass(), false, new MediaLog())); 250 video_decoders.Pass(), false, nullptr, new MediaLog()));
251 251
252 if (!clockless_playback_) { 252 if (!clockless_playback_) {
253 audio_sink_ = new NullAudioSink(message_loop_.message_loop_proxy()); 253 audio_sink_ = new NullAudioSink(message_loop_.message_loop_proxy());
254 } else { 254 } else {
255 clockless_audio_sink_ = new ClocklessAudioSink(); 255 clockless_audio_sink_ = new ClocklessAudioSink();
256 } 256 }
257 257
258 ScopedVector<AudioDecoder> audio_decoders; 258 ScopedVector<AudioDecoder> audio_decoders;
259 259
260 #if !defined(MEDIA_DISABLE_FFMPEG) 260 #if !defined(MEDIA_DISABLE_FFMPEG)
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 DCHECK(clockless_playback_); 320 DCHECK(clockless_playback_);
321 return clockless_audio_sink_->render_time(); 321 return clockless_audio_sink_->render_time();
322 } 322 }
323 323
324 base::TimeTicks DummyTickClock::NowTicks() { 324 base::TimeTicks DummyTickClock::NowTicks() {
325 now_ += base::TimeDelta::FromSeconds(60); 325 now_ += base::TimeDelta::FromSeconds(60);
326 return now_; 326 return now_;
327 } 327 }
328 328
329 } // namespace media 329 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/video_renderer_impl_unittest.cc ('k') | media/video/gpu_memory_buffer_video_frame_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698