| 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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 } | 355 } |
| 356 #endif | 356 #endif |
| 357 | 357 |
| 358 TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) { | 358 TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) { |
| 359 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240-16x9-aspect.webm"), | 359 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240-16x9-aspect.webm"), |
| 360 PIPELINE_OK)); | 360 PIPELINE_OK)); |
| 361 Play(); | 361 Play(); |
| 362 ASSERT_TRUE(WaitUntilOnEnded()); | 362 ASSERT_TRUE(WaitUntilOnEnded()); |
| 363 } | 363 } |
| 364 | 364 |
| 365 TEST_F(PipelineIntegrationTest, EncryptedPlayback) { | 365 // TODO(fgalligan): Enable after HMAC has been removed. http://crbug.com/150014 |
| 366 MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 220788); | 366 TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) { |
| 367 MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 219816); |
| 367 FakeDecryptorClient encrypted_media; | 368 FakeDecryptorClient encrypted_media; |
| 368 StartPipelineWithEncryptedMedia(&source, &encrypted_media); | 369 StartPipelineWithEncryptedMedia(&source, &encrypted_media); |
| 369 | 370 |
| 370 source.EndOfStream(); | 371 source.EndOfStream(); |
| 371 ASSERT_EQ(PIPELINE_OK, pipeline_status_); | 372 ASSERT_EQ(PIPELINE_OK, pipeline_status_); |
| 372 | 373 |
| 373 Play(); | 374 Play(); |
| 374 | 375 |
| 375 ASSERT_TRUE(WaitUntilOnEnded()); | 376 ASSERT_TRUE(WaitUntilOnEnded()); |
| 376 source.Abort(); | 377 source.Abort(); |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 // Verify video decoder & renderer can handle aborted demuxer reads. | 434 // Verify video decoder & renderer can handle aborted demuxer reads. |
| 434 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { | 435 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { |
| 435 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM, | 436 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM, |
| 436 32768, | 437 32768, |
| 437 base::TimeDelta::FromMilliseconds(200), | 438 base::TimeDelta::FromMilliseconds(200), |
| 438 base::TimeDelta::FromMilliseconds(1668), | 439 base::TimeDelta::FromMilliseconds(1668), |
| 439 0x1C896, 65536)); | 440 0x1C896, 65536)); |
| 440 } | 441 } |
| 441 | 442 |
| 442 } // namespace media | 443 } // namespace media |
| OLD | NEW |