| OLD | NEW |
| 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 base::Bind(&PipelineIntegrationTestBase::OnError, base::Unretained(this)), | 127 base::Bind(&PipelineIntegrationTestBase::OnError, base::Unretained(this)), |
| 128 base::Bind(&PipelineIntegrationTestBase::OnStatusCallback, | 128 base::Bind(&PipelineIntegrationTestBase::OnStatusCallback, |
| 129 base::Unretained(this)), | 129 base::Unretained(this)), |
| 130 base::Bind(&PipelineIntegrationTestBase::OnMetadata, | 130 base::Bind(&PipelineIntegrationTestBase::OnMetadata, |
| 131 base::Unretained(this)), | 131 base::Unretained(this)), |
| 132 base::Bind(&PipelineIntegrationTestBase::OnBufferingStateChanged, | 132 base::Bind(&PipelineIntegrationTestBase::OnBufferingStateChanged, |
| 133 base::Unretained(this)), | 133 base::Unretained(this)), |
| 134 base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint, | 134 base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint, |
| 135 base::Unretained(this)), | 135 base::Unretained(this)), |
| 136 base::Closure(), base::Bind(&PipelineIntegrationTestBase::OnAddTextTrack, | 136 base::Closure(), base::Bind(&PipelineIntegrationTestBase::OnAddTextTrack, |
| 137 base::Unretained(this))); | 137 base::Unretained(this)), |
| 138 base::Closure()); |
| 138 message_loop_.Run(); | 139 message_loop_.Run(); |
| 139 return pipeline_status_; | 140 return pipeline_status_; |
| 140 } | 141 } |
| 141 | 142 |
| 142 PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename, | 143 PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename, |
| 143 kTestType test_type) { | 144 kTestType test_type) { |
| 144 hashing_enabled_ = test_type == kHashed; | 145 hashing_enabled_ = test_type == kHashed; |
| 145 clockless_playback_ = test_type == kClockless; | 146 clockless_playback_ = test_type == kClockless; |
| 146 return Start(filename); | 147 return Start(filename); |
| 147 } | 148 } |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 DCHECK(clockless_playback_); | 309 DCHECK(clockless_playback_); |
| 309 return clockless_audio_sink_->render_time(); | 310 return clockless_audio_sink_->render_time(); |
| 310 } | 311 } |
| 311 | 312 |
| 312 base::TimeTicks DummyTickClock::NowTicks() { | 313 base::TimeTicks DummyTickClock::NowTicks() { |
| 313 now_ += base::TimeDelta::FromSeconds(60); | 314 now_ += base::TimeDelta::FromSeconds(60); |
| 314 return now_; | 315 return now_; |
| 315 } | 316 } |
| 316 | 317 |
| 317 } // namespace media | 318 } // namespace media |
| OLD | NEW |