| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 #include "content/browser/media/media_browsertest.h" | 7 #include "content/browser/media/media_browsertest.h" |
| 8 #include "content/public/common/content_switches.h" | 8 #include "content/public/common/content_switches.h" |
| 9 #include "media/media_features.h" | 9 #include "media/media_features.h" |
| 10 #if defined(OS_ANDROID) | 10 #if defined(OS_ANDROID) |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_Opus_WebM) { | 70 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_Opus_WebM) { |
| 71 TestSimplePlayback("bear-opus.webm", kWebMOpusAudioOnly, kEnded); | 71 TestSimplePlayback("bear-opus.webm", kWebMOpusAudioOnly, kEnded); |
| 72 } | 72 } |
| 73 #endif | 73 #endif |
| 74 | 74 |
| 75 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_WebM) { | 75 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioOnly_WebM) { |
| 76 TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly, kEnded); | 76 TestSimplePlayback("bear-320x240-audio-only.webm", kWebMAudioOnly, kEnded); |
| 77 } | 77 } |
| 78 | 78 |
| 79 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) { | 79 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Type_Error) { |
| 80 TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly, kError); | 80 TestSimplePlayback("bear-320x240-video-only.webm", kWebMAudioOnly, |
| 81 kErrorEvent); |
| 81 } | 82 } |
| 82 | 83 |
| 83 // Flaky test crbug.com/246308 | 84 // Flaky test crbug.com/246308 |
| 84 // Test changed to skip checks resulting in flakiness. Proper fix still needed. | 85 // Test changed to skip checks resulting in flakiness. Proper fix still needed. |
| 85 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { | 86 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { |
| 86 RunMediaTestPage("mse_config_change.html", base::StringPairs(), kEnded, true); | 87 RunMediaTestPage("mse_config_change.html", base::StringPairs(), kEnded, true); |
| 87 } | 88 } |
| 88 | 89 |
| 89 #if defined(USE_PROPRIETARY_CODECS) | 90 #if defined(USE_PROPRIETARY_CODECS) |
| 90 | 91 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 107 #endif | 108 #endif |
| 108 | 109 |
| 109 #if defined(USE_PROPRIETARY_CODECS) | 110 #if defined(USE_PROPRIETARY_CODECS) |
| 110 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) | 111 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) |
| 111 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioVideo_Mp2t) { | 112 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioVideo_Mp2t) { |
| 112 TestSimplePlayback("bear-1280x720.ts", kMp2tAudioVideo, kEnded); | 113 TestSimplePlayback("bear-1280x720.ts", kMp2tAudioVideo, kEnded); |
| 113 } | 114 } |
| 114 #endif | 115 #endif |
| 115 #endif | 116 #endif |
| 116 } // namespace content | 117 } // namespace content |
| OLD | NEW |