Chromium Code Reviews| 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/filters/pipeline_integration_test_base.h" | 5 #include "media/filters/pipeline_integration_test_base.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "media/base/decoder_buffer.h" | 8 #include "media/base/decoder_buffer.h" |
| 9 #include "media/base/decryptor_client.h" | 9 #include "media/base/decryptor_client.h" |
| 10 #include "media/base/test_data_util.h" | 10 #include "media/base/test_data_util.h" |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 276 EXPECT_EQ(pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds(), 0); | 276 EXPECT_EQ(pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds(), 0); |
| 277 EXPECT_EQ(pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds(), 2737); | 277 EXPECT_EQ(pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds(), 2737); |
| 278 | 278 |
| 279 Play(); | 279 Play(); |
| 280 | 280 |
| 281 ASSERT_TRUE(WaitUntilOnEnded()); | 281 ASSERT_TRUE(WaitUntilOnEnded()); |
| 282 source.Abort(); | 282 source.Abort(); |
| 283 Stop(); | 283 Stop(); |
| 284 } | 284 } |
| 285 | 285 |
| 286 TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) { | |
| 287 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240-16x9-aspect.webm"), | |
|
Ami GONE FROM CHROMIUM
2012/08/01 21:05:13
Did you forget to add this file to the CL?
acolwell GONE FROM CHROMIUM
2012/08/01 23:20:45
No. Since I have to land it separately I just left
| |
| 288 PIPELINE_OK)); | |
| 289 Play(); | |
| 290 ASSERT_TRUE(WaitUntilOnEnded()); | |
| 291 } | |
| 292 | |
| 286 // TODO(fgalligan): Enable test when encrypted test data is updated and new | 293 // TODO(fgalligan): Enable test when encrypted test data is updated and new |
| 287 // decryption code is landed. http://crbug.com/132801 | 294 // decryption code is landed. http://crbug.com/132801 |
| 288 TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) { | 295 TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) { |
| 289 MockMediaSource source("bear-320x240-encrypted.webm", 220730, true, true); | 296 MockMediaSource source("bear-320x240-encrypted.webm", 220730, true, true); |
| 290 FakeDecryptorClient encrypted_media; | 297 FakeDecryptorClient encrypted_media; |
| 291 StartPipelineWithEncryptedMedia(&source, &encrypted_media); | 298 StartPipelineWithEncryptedMedia(&source, &encrypted_media); |
| 292 | 299 |
| 293 source.EndOfStream(); | 300 source.EndOfStream(); |
| 294 ASSERT_EQ(PIPELINE_OK, pipeline_status_); | 301 ASSERT_EQ(PIPELINE_OK, pipeline_status_); |
| 295 | 302 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 354 | 361 |
| 355 // Verify video decoder & renderer can handle aborted demuxer reads. | 362 // Verify video decoder & renderer can handle aborted demuxer reads. |
| 356 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { | 363 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { |
| 357 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768, | 364 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768, |
| 358 base::TimeDelta::FromMilliseconds(200), | 365 base::TimeDelta::FromMilliseconds(200), |
| 359 base::TimeDelta::FromMilliseconds(1668), | 366 base::TimeDelta::FromMilliseconds(1668), |
| 360 0x1C896, 65536, false, true)); | 367 0x1C896, 65536, false, true)); |
| 361 } | 368 } |
| 362 | 369 |
| 363 } // namespace media | 370 } // namespace media |
| OLD | NEW |