| 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/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 1477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1488 // Verify that VP8 video with inband text track can be played back. | 1488 // Verify that VP8 video with inband text track can be played back. |
| 1489 TEST_F(PipelineIntegrationTest, | 1489 TEST_F(PipelineIntegrationTest, |
| 1490 BasicPlayback_VP8_WebVTT_WebM) { | 1490 BasicPlayback_VP8_WebVTT_WebM) { |
| 1491 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"), | 1491 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"), |
| 1492 PIPELINE_OK)); | 1492 PIPELINE_OK)); |
| 1493 Play(); | 1493 Play(); |
| 1494 ASSERT_TRUE(WaitUntilOnEnded()); | 1494 ASSERT_TRUE(WaitUntilOnEnded()); |
| 1495 } | 1495 } |
| 1496 | 1496 |
| 1497 // Verify that VP9 video with 4:4:4 subsampling can be played back. | 1497 // Verify that VP9 video with 4:4:4 subsampling can be played back. |
| 1498 // TODO(johannkoenig): Reenable after landing libvpx roll | 1498 TEST_F(PipelineIntegrationTest, P444_VP9_WebM) { |
| 1499 // http://www.crbug.com/392309 | |
| 1500 TEST_F(PipelineIntegrationTest, DISABLED_P444_VP9_WebM) { | |
| 1501 ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240-P444.webm"), | 1499 ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240-P444.webm"), |
| 1502 PIPELINE_OK)); | 1500 PIPELINE_OK)); |
| 1503 Play(); | 1501 Play(); |
| 1504 ASSERT_TRUE(WaitUntilOnEnded()); | 1502 ASSERT_TRUE(WaitUntilOnEnded()); |
| 1505 EXPECT_EQ(last_video_frame_format_, VideoFrame::YV24); | 1503 EXPECT_EQ(last_video_frame_format_, VideoFrame::YV24); |
| 1506 } | 1504 } |
| 1507 | 1505 |
| 1508 // Verify that videos with an odd frame size playback successfully. | 1506 // Verify that videos with an odd frame size playback successfully. |
| 1509 TEST_F(PipelineIntegrationTest, BasicPlayback_OddVideoSize) { | 1507 TEST_F(PipelineIntegrationTest, BasicPlayback_OddVideoSize) { |
| 1510 ASSERT_TRUE(Start(GetTestDataFilePath("butterfly-853x480.webm"), | 1508 ASSERT_TRUE(Start(GetTestDataFilePath("butterfly-853x480.webm"), |
| (...skipping 24 matching lines...) Expand all Loading... |
| 1535 ASSERT_TRUE(WaitUntilOnEnded()); | 1533 ASSERT_TRUE(WaitUntilOnEnded()); |
| 1536 source.Abort(); | 1534 source.Abort(); |
| 1537 Stop(); | 1535 Stop(); |
| 1538 EXPECT_EQ(48000, | 1536 EXPECT_EQ(48000, |
| 1539 demuxer_->GetStream(DemuxerStream::AUDIO) | 1537 demuxer_->GetStream(DemuxerStream::AUDIO) |
| 1540 ->audio_decoder_config() | 1538 ->audio_decoder_config() |
| 1541 .samples_per_second()); | 1539 .samples_per_second()); |
| 1542 } | 1540 } |
| 1543 | 1541 |
| 1544 } // namespace media | 1542 } // namespace media |
| OLD | NEW |