| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/message_loop.h" | 6 #include "base/message_loop.h" |
| 7 #include "media/base/filter_collection.h" | 7 #include "media/base/filter_collection.h" |
| 8 #include "media/base/media_log.h" | 8 #include "media/base/media_log.h" |
| 9 #include "media/base/message_loop_factory_impl.h" | 9 #include "media/base/message_loop_factory_impl.h" |
| 10 #include "media/base/pipeline.h" | 10 #include "media/base/pipeline.h" |
| (...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 | 296 |
| 297 | 297 |
| 298 TEST_F(PipelineIntegrationTest, BasicPlayback) { | 298 TEST_F(PipelineIntegrationTest, BasicPlayback) { |
| 299 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240.webm"), PIPELINE_OK)); | 299 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240.webm"), PIPELINE_OK)); |
| 300 | 300 |
| 301 Play(); | 301 Play(); |
| 302 | 302 |
| 303 ASSERT_TRUE(WaitUntilOnEnded()); | 303 ASSERT_TRUE(WaitUntilOnEnded()); |
| 304 } | 304 } |
| 305 | 305 |
| 306 TEST_F(PipelineIntegrationTest, SeekWhilePaused) { | 306 // TODO(acolwell): Fix flakiness http://crbug.com/109875 |
| 307 TEST_F(PipelineIntegrationTest, DISABLED_SeekWhilePaused) { |
| 307 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240.webm"), PIPELINE_OK)); | 308 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240.webm"), PIPELINE_OK)); |
| 308 | 309 |
| 309 base::TimeDelta duration(pipeline_->GetMediaDuration()); | 310 base::TimeDelta duration(pipeline_->GetMediaDuration()); |
| 310 base::TimeDelta start_seek_time(duration / 4); | 311 base::TimeDelta start_seek_time(duration / 4); |
| 311 base::TimeDelta seek_time(duration * 3 / 4); | 312 base::TimeDelta seek_time(duration * 3 / 4); |
| 312 | 313 |
| 313 Play(); | 314 Play(); |
| 314 ASSERT_TRUE(WaitUntilCurrentTimeIsAfter(start_seek_time)); | 315 ASSERT_TRUE(WaitUntilCurrentTimeIsAfter(start_seek_time)); |
| 315 Pause(); | 316 Pause(); |
| 316 ASSERT_TRUE(Seek(seek_time)); | 317 ASSERT_TRUE(Seek(seek_time)); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 | 357 |
| 357 // Verify video decoder & renderer can handle aborted demuxer reads. | 358 // Verify video decoder & renderer can handle aborted demuxer reads. |
| 358 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { | 359 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { |
| 359 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768, | 360 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768, |
| 360 base::TimeDelta::FromMilliseconds(200), | 361 base::TimeDelta::FromMilliseconds(200), |
| 361 base::TimeDelta::FromMilliseconds(1668), | 362 base::TimeDelta::FromMilliseconds(1668), |
| 362 0x1C896, 65536)); | 363 0x1C896, 65536)); |
| 363 } | 364 } |
| 364 | 365 |
| 365 } // namespace media | 366 } // namespace media |
| OLD | NEW |