| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 decoder_(new MockVideoDecoder()), | 52 decoder_(new MockVideoDecoder()), |
| 53 demuxer_stream_(DemuxerStream::VIDEO) { | 53 demuxer_stream_(DemuxerStream::VIDEO) { |
| 54 ScopedVector<VideoDecoder> decoders; | 54 ScopedVector<VideoDecoder> decoders; |
| 55 decoders.push_back(decoder_); | 55 decoders.push_back(decoder_); |
| 56 | 56 |
| 57 null_video_sink_.reset(new NullVideoSink( | 57 null_video_sink_.reset(new NullVideoSink( |
| 58 false, base::TimeDelta::FromSecondsD(1.0 / 60), | 58 false, base::TimeDelta::FromSecondsD(1.0 / 60), |
| 59 base::Bind(&MockCB::FrameReceived, base::Unretained(&mock_cb_)), | 59 base::Bind(&MockCB::FrameReceived, base::Unretained(&mock_cb_)), |
| 60 message_loop_.task_runner())); | 60 message_loop_.task_runner())); |
| 61 | 61 |
| 62 renderer_.reset(new VideoRendererImpl( | 62 renderer_.reset(new VideoRendererImpl(message_loop_.message_loop_proxy(), |
| 63 message_loop_.message_loop_proxy(), null_video_sink_.get(), | 63 null_video_sink_.get(), |
| 64 decoders.Pass(), true, new MediaLog())); | 64 decoders.Pass(), true, |
| 65 nullptr, // gpu_factories |
| 66 new MediaLog())); |
| 65 if (!GetParam()) | 67 if (!GetParam()) |
| 66 renderer_->disable_new_video_renderer_for_testing(); | 68 renderer_->disable_new_video_renderer_for_testing(); |
| 67 renderer_->SetTickClockForTesting(scoped_ptr<base::TickClock>(tick_clock_)); | 69 renderer_->SetTickClockForTesting(scoped_ptr<base::TickClock>(tick_clock_)); |
| 68 null_video_sink_->set_tick_clock_for_testing(tick_clock_); | 70 null_video_sink_->set_tick_clock_for_testing(tick_clock_); |
| 69 | 71 |
| 70 // Start wallclock time at a non-zero value. | 72 // Start wallclock time at a non-zero value. |
| 71 AdvanceWallclockTimeInMs(12345); | 73 AdvanceWallclockTimeInMs(12345); |
| 72 | 74 |
| 73 demuxer_stream_.set_video_decoder_config(TestVideoConfig::Normal()); | 75 demuxer_stream_.set_video_decoder_config(TestVideoConfig::Normal()); |
| 74 | 76 |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 697 } | 699 } |
| 698 | 700 |
| 699 INSTANTIATE_TEST_CASE_P(OldVideoRenderer, | 701 INSTANTIATE_TEST_CASE_P(OldVideoRenderer, |
| 700 VideoRendererImplTest, | 702 VideoRendererImplTest, |
| 701 testing::Values(false)); | 703 testing::Values(false)); |
| 702 INSTANTIATE_TEST_CASE_P(NewVideoRenderer, | 704 INSTANTIATE_TEST_CASE_P(NewVideoRenderer, |
| 703 VideoRendererImplTest, | 705 VideoRendererImplTest, |
| 704 testing::Values(true)); | 706 testing::Values(true)); |
| 705 | 707 |
| 706 } // namespace media | 708 } // namespace media |
| OLD | NEW |