| OLD | NEW |
| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 decoder_(new MockVideoDecoder()), | 54 decoder_(new MockVideoDecoder()), |
| 55 demuxer_stream_(DemuxerStream::VIDEO) { | 55 demuxer_stream_(DemuxerStream::VIDEO) { |
| 56 ScopedVector<VideoDecoder> decoders; | 56 ScopedVector<VideoDecoder> decoders; |
| 57 decoders.push_back(decoder_); | 57 decoders.push_back(decoder_); |
| 58 | 58 |
| 59 null_video_sink_.reset(new NullVideoSink( | 59 null_video_sink_.reset(new NullVideoSink( |
| 60 false, base::TimeDelta::FromSecondsD(1.0 / 60), | 60 false, base::TimeDelta::FromSecondsD(1.0 / 60), |
| 61 base::Bind(&MockCB::FrameReceived, base::Unretained(&mock_cb_)), | 61 base::Bind(&MockCB::FrameReceived, base::Unretained(&mock_cb_)), |
| 62 message_loop_.task_runner())); | 62 message_loop_.task_runner())); |
| 63 | 63 |
| 64 renderer_.reset(new VideoRendererImpl(message_loop_.task_runner(), | 64 renderer_.reset(new VideoRendererImpl( |
| 65 null_video_sink_.get(), | 65 message_loop_.task_runner(), message_loop_.task_runner().get(), |
| 66 decoders.Pass(), true, | 66 null_video_sink_.get(), decoders.Pass(), true, |
| 67 nullptr, // gpu_factories | 67 nullptr, // gpu_factories |
| 68 new MediaLog())); | 68 new MediaLog())); |
| 69 if (!GetParam()) | 69 if (!GetParam()) |
| 70 renderer_->disable_new_video_renderer_for_testing(); | 70 renderer_->disable_new_video_renderer_for_testing(); |
| 71 renderer_->SetTickClockForTesting(scoped_ptr<base::TickClock>(tick_clock_)); | 71 renderer_->SetTickClockForTesting(scoped_ptr<base::TickClock>(tick_clock_)); |
| 72 null_video_sink_->set_tick_clock_for_testing(tick_clock_); | 72 null_video_sink_->set_tick_clock_for_testing(tick_clock_); |
| 73 time_source_.set_tick_clock_for_testing(tick_clock_); | 73 time_source_.set_tick_clock_for_testing(tick_clock_); |
| 74 | 74 |
| 75 // Start wallclock time at a non-zero value. | 75 // Start wallclock time at a non-zero value. |
| 76 AdvanceWallclockTimeInMs(12345); | 76 AdvanceWallclockTimeInMs(12345); |
| 77 | 77 |
| 78 demuxer_stream_.set_video_decoder_config(TestVideoConfig::Normal()); | 78 demuxer_stream_.set_video_decoder_config(TestVideoConfig::Normal()); |
| (...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 } | 748 } |
| 749 | 749 |
| 750 INSTANTIATE_TEST_CASE_P(OldVideoRenderer, | 750 INSTANTIATE_TEST_CASE_P(OldVideoRenderer, |
| 751 VideoRendererImplTest, | 751 VideoRendererImplTest, |
| 752 testing::Values(false)); | 752 testing::Values(false)); |
| 753 INSTANTIATE_TEST_CASE_P(NewVideoRenderer, | 753 INSTANTIATE_TEST_CASE_P(NewVideoRenderer, |
| 754 VideoRendererImplTest, | 754 VideoRendererImplTest, |
| 755 testing::Values(true)); | 755 testing::Values(true)); |
| 756 | 756 |
| 757 } // namespace media | 757 } // namespace media |
| OLD | NEW |