| 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 "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "media/base/decoder_buffer.h" | 9 #include "media/base/decoder_buffer.h" |
| 10 #include "media/base/decryptor_client.h" | 10 #include "media/base/decryptor_client.h" |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 } | 361 } |
| 362 #endif | 362 #endif |
| 363 | 363 |
| 364 TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) { | 364 TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) { |
| 365 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240-16x9-aspect.webm"), | 365 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240-16x9-aspect.webm"), |
| 366 PIPELINE_OK)); | 366 PIPELINE_OK)); |
| 367 Play(); | 367 Play(); |
| 368 ASSERT_TRUE(WaitUntilOnEnded()); | 368 ASSERT_TRUE(WaitUntilOnEnded()); |
| 369 } | 369 } |
| 370 | 370 |
| 371 // TODO(fgalligan): Enable after WebM parser has been updated. | 371 TEST_F(PipelineIntegrationTest, EncryptedPlayback) { |
| 372 // http://crbug.com/155641 | |
| 373 TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) { | |
| 374 MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 219816); | 372 MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 219816); |
| 375 FakeDecryptorClient encrypted_media; | 373 FakeDecryptorClient encrypted_media; |
| 376 StartPipelineWithEncryptedMedia(&source, &encrypted_media); | 374 StartPipelineWithEncryptedMedia(&source, &encrypted_media); |
| 377 | 375 |
| 378 source.EndOfStream(); | 376 source.EndOfStream(); |
| 379 ASSERT_EQ(PIPELINE_OK, pipeline_status_); | 377 ASSERT_EQ(PIPELINE_OK, pipeline_status_); |
| 380 | 378 |
| 381 Play(); | 379 Play(); |
| 382 | 380 |
| 383 ASSERT_TRUE(WaitUntilOnEnded()); | 381 ASSERT_TRUE(WaitUntilOnEnded()); |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 // Verify video decoder & renderer can handle aborted demuxer reads. | 439 // Verify video decoder & renderer can handle aborted demuxer reads. |
| 442 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { | 440 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { |
| 443 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM, | 441 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM, |
| 444 32768, | 442 32768, |
| 445 base::TimeDelta::FromMilliseconds(200), | 443 base::TimeDelta::FromMilliseconds(200), |
| 446 base::TimeDelta::FromMilliseconds(1668), | 444 base::TimeDelta::FromMilliseconds(1668), |
| 447 0x1C896, 65536)); | 445 0x1C896, 65536)); |
| 448 } | 446 } |
| 449 | 447 |
| 450 } // namespace media | 448 } // namespace media |
| OLD | NEW |