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 "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| (...skipping 880 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 891 // Verify that VP9 video and Opus audio in the same WebM container can be played | 891 // Verify that VP9 video and Opus audio in the same WebM container can be played |
| 892 // back. | 892 // back. |
| 893 // Disabled since it might crash or corrupt heap, see http://crbug.com/173333 | 893 // Disabled since it might crash or corrupt heap, see http://crbug.com/173333 |
| 894 TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VP9_Opus_WebM) { | 894 TEST_F(PipelineIntegrationTest, DISABLED_BasicPlayback_VP9_Opus_WebM) { |
| 895 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"), | 895 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp9-opus.webm"), |
| 896 PIPELINE_OK)); | 896 PIPELINE_OK)); |
| 897 Play(); | 897 Play(); |
| 898 ASSERT_TRUE(WaitUntilOnEnded()); | 898 ASSERT_TRUE(WaitUntilOnEnded()); |
| 899 } | 899 } |
| 900 | 900 |
| 901 // Verify that VP8 video with alpha channel can be played back | |
|
scherkus (not reviewing)
2013/04/10 00:22:24
comments end with periods
vignesh
2013/04/10 17:59:16
Done.
| |
| 902 TEST_F(PipelineIntegrationTest, BasicPlayback_VP8A_WebM) { | |
| 903 ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8a.webm"), | |
| 904 PIPELINE_OK)); | |
| 905 Play(); | |
| 906 ASSERT_TRUE(WaitUntilOnEnded()); | |
| 907 } | |
| 908 | |
| 901 } // namespace media | 909 } // namespace media |
| OLD | NEW |