| 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 MOCK_METHOD1(BufferingStateChange, void(BufferingState)); | 283 MOCK_METHOD1(BufferingStateChange, void(BufferingState)); |
| 284 }; | 284 }; |
| 285 StrictMock<MockCB> mock_cb_; | 285 StrictMock<MockCB> mock_cb_; |
| 286 | 286 |
| 287 // Must be destroyed before |renderer_| since they share |tick_clock_|. | 287 // Must be destroyed before |renderer_| since they share |tick_clock_|. |
| 288 scoped_ptr<NullVideoSink> null_video_sink_; | 288 scoped_ptr<NullVideoSink> null_video_sink_; |
| 289 | 289 |
| 290 PipelineStatistics last_pipeline_statistics_; | 290 PipelineStatistics last_pipeline_statistics_; |
| 291 | 291 |
| 292 private: | 292 private: |
| 293 base::TimeTicks GetWallClockTime(base::TimeDelta time) { | 293 base::TimeTicks GetWallClockTime(base::TimeDelta time, int request_flags) { |
| 294 base::AutoLock l(lock_); | 294 base::AutoLock l(lock_); |
| 295 return tick_clock_->NowTicks() + (time - time_); | 295 return tick_clock_->NowTicks() + (time - time_); |
| 296 } | 296 } |
| 297 | 297 |
| 298 void DecodeRequested(const scoped_refptr<DecoderBuffer>& buffer, | 298 void DecodeRequested(const scoped_refptr<DecoderBuffer>& buffer, |
| 299 const VideoDecoder::DecodeCB& decode_cb) { | 299 const VideoDecoder::DecodeCB& decode_cb) { |
| 300 DCHECK_EQ(&message_loop_, base::MessageLoop::current()); | 300 DCHECK_EQ(&message_loop_, base::MessageLoop::current()); |
| 301 CHECK(decode_cb_.is_null()); | 301 CHECK(decode_cb_.is_null()); |
| 302 decode_cb_ = decode_cb; | 302 decode_cb_ = decode_cb; |
| 303 | 303 |
| (...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 } | 693 } |
| 694 | 694 |
| 695 INSTANTIATE_TEST_CASE_P(OldVideoRenderer, | 695 INSTANTIATE_TEST_CASE_P(OldVideoRenderer, |
| 696 VideoRendererImplTest, | 696 VideoRendererImplTest, |
| 697 testing::Values(false)); | 697 testing::Values(false)); |
| 698 INSTANTIATE_TEST_CASE_P(NewVideoRenderer, | 698 INSTANTIATE_TEST_CASE_P(NewVideoRenderer, |
| 699 VideoRendererImplTest, | 699 VideoRendererImplTest, |
| 700 testing::Values(true)); | 700 testing::Values(true)); |
| 701 | 701 |
| 702 } // namespace media | 702 } // namespace media |
| OLD | NEW |