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 <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/memory/scoped_vector.h" | 10 #include "base/memory/scoped_vector.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 using ::testing::SaveArg; | 36 using ::testing::SaveArg; |
37 | 37 |
38 namespace media { | 38 namespace media { |
39 | 39 |
40 const char kNullVideoHash[] = "d41d8cd98f00b204e9800998ecf8427e"; | 40 const char kNullVideoHash[] = "d41d8cd98f00b204e9800998ecf8427e"; |
41 const char kNullAudioHash[] = "0.00,0.00,0.00,0.00,0.00,0.00,"; | 41 const char kNullAudioHash[] = "0.00,0.00,0.00,0.00,0.00,0.00,"; |
42 | 42 |
43 PipelineIntegrationTestBase::PipelineIntegrationTestBase() | 43 PipelineIntegrationTestBase::PipelineIntegrationTestBase() |
44 : hashing_enabled_(false), | 44 : hashing_enabled_(false), |
45 clockless_playback_(false), | 45 clockless_playback_(false), |
46 pipeline_(new PipelineImpl(message_loop_.task_runner(), new MediaLog())), | 46 pipeline_( |
| 47 new PipelineImpl(this, message_loop_.task_runner(), new MediaLog())), |
47 ended_(false), | 48 ended_(false), |
48 pipeline_status_(PIPELINE_OK), | 49 pipeline_status_(PIPELINE_OK), |
49 last_video_frame_format_(PIXEL_FORMAT_UNKNOWN), | 50 last_video_frame_format_(PIXEL_FORMAT_UNKNOWN), |
50 last_video_frame_color_space_(COLOR_SPACE_UNSPECIFIED), | 51 last_video_frame_color_space_(COLOR_SPACE_UNSPECIFIED), |
51 hardware_config_(AudioParameters(), AudioParameters()) { | 52 hardware_config_(AudioParameters(), AudioParameters()) { |
52 base::MD5Init(&md5_context_); | 53 base::MD5Init(&md5_context_); |
53 } | 54 } |
54 | 55 |
55 PipelineIntegrationTestBase::~PipelineIntegrationTestBase() { | 56 PipelineIntegrationTestBase::~PipelineIntegrationTestBase() { |
56 if (!pipeline_->IsRunning()) | 57 if (!pipeline_->IsRunning()) |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 DCHECK(clockless_playback_); | 389 DCHECK(clockless_playback_); |
389 return clockless_audio_sink_->render_time(); | 390 return clockless_audio_sink_->render_time(); |
390 } | 391 } |
391 | 392 |
392 base::TimeTicks DummyTickClock::NowTicks() { | 393 base::TimeTicks DummyTickClock::NowTicks() { |
393 now_ += base::TimeDelta::FromSeconds(60); | 394 now_ += base::TimeDelta::FromSeconds(60); |
394 return now_; | 395 return now_; |
395 } | 396 } |
396 | 397 |
397 } // namespace media | 398 } // namespace media |
OLD | NEW |