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

Side by Side Diff: media/renderers/video_renderer_impl_unittest.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
« no previous file with comments | « media/renderers/video_renderer_impl.cc ('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 <utility> 5 #include <utility>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/debug/stack_trace.h" 10 #include "base/debug/stack_trace.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 decoder_(new MockVideoDecoder()), 53 decoder_(new MockVideoDecoder()),
54 demuxer_stream_(DemuxerStream::VIDEO) { 54 demuxer_stream_(DemuxerStream::VIDEO) {
55 ScopedVector<VideoDecoder> decoders; 55 ScopedVector<VideoDecoder> decoders;
56 decoders.push_back(decoder_); 56 decoders.push_back(decoder_);
57 57
58 null_video_sink_.reset(new NullVideoSink( 58 null_video_sink_.reset(new NullVideoSink(
59 false, base::TimeDelta::FromSecondsD(1.0 / 60), 59 false, base::TimeDelta::FromSecondsD(1.0 / 60),
60 base::Bind(&MockCB::FrameReceived, base::Unretained(&mock_cb_)), 60 base::Bind(&MockCB::FrameReceived, base::Unretained(&mock_cb_)),
61 message_loop_.task_runner())); 61 message_loop_.task_runner()));
62 62
63 renderer_.reset(new VideoRendererImpl( 63 renderer_.reset(new VideoRendererImpl(message_loop_.message_loop_proxy(),
64 message_loop_.message_loop_proxy(), null_video_sink_.get(), 64 null_video_sink_.get(),
65 decoders.Pass(), true, new MediaLog())); 65 decoders.Pass(), true,
66 nullptr, // gpu_factories
67 new MediaLog()));
66 if (!GetParam()) 68 if (!GetParam())
67 renderer_->disable_new_video_renderer_for_testing(); 69 renderer_->disable_new_video_renderer_for_testing();
68 renderer_->SetTickClockForTesting(scoped_ptr<base::TickClock>(tick_clock_)); 70 renderer_->SetTickClockForTesting(scoped_ptr<base::TickClock>(tick_clock_));
69 null_video_sink_->set_tick_clock_for_testing(tick_clock_); 71 null_video_sink_->set_tick_clock_for_testing(tick_clock_);
70 time_source_.set_tick_clock_for_testing(tick_clock_); 72 time_source_.set_tick_clock_for_testing(tick_clock_);
71 73
72 // Start wallclock time at a non-zero value. 74 // Start wallclock time at a non-zero value.
73 AdvanceWallclockTimeInMs(12345); 75 AdvanceWallclockTimeInMs(12345);
74 76
75 demuxer_stream_.set_video_decoder_config(TestVideoConfig::Normal()); 77 demuxer_stream_.set_video_decoder_config(TestVideoConfig::Normal());
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 } 715 }
714 716
715 INSTANTIATE_TEST_CASE_P(OldVideoRenderer, 717 INSTANTIATE_TEST_CASE_P(OldVideoRenderer,
716 VideoRendererImplTest, 718 VideoRendererImplTest,
717 testing::Values(false)); 719 testing::Values(false));
718 INSTANTIATE_TEST_CASE_P(NewVideoRenderer, 720 INSTANTIATE_TEST_CASE_P(NewVideoRenderer,
719 VideoRendererImplTest, 721 VideoRendererImplTest,
720 testing::Values(true)); 722 testing::Values(true));
721 723
722 } // namespace media 724 } // namespace media
OLDNEW
« no previous file with comments | « media/renderers/video_renderer_impl.cc ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698