| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 // Test changed to skip checks resulting in flakiness. Proper fix still needed. | 100 // Test changed to skip checks resulting in flakiness. Proper fix still needed. |
| 101 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { | 101 IN_PROC_BROWSER_TEST_F(MediaSourceTest, ConfigChangeVideo) { |
| 102 if (!IsMSESupported()) { | 102 if (!IsMSESupported()) { |
| 103 VLOG(0) << "Skipping test - MSE not supported."; | 103 VLOG(0) << "Skipping test - MSE not supported."; |
| 104 return; | 104 return; |
| 105 } | 105 } |
| 106 RunMediaTestPage("mse_config_change.html", base::StringPairs(), kEnded, true); | 106 RunMediaTestPage("mse_config_change.html", base::StringPairs(), kEnded, true); |
| 107 } | 107 } |
| 108 | 108 |
| 109 #if defined(USE_PROPRIETARY_CODECS) | 109 #if defined(USE_PROPRIETARY_CODECS) |
| 110 |
| 111 // TODO(chcunningham): Figure out why this is flaky on android. crbug/607841 |
| 112 #if !defined(OS_ANDROID) |
| 110 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Video_MP4_Audio_WEBM) { | 113 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Video_MP4_Audio_WEBM) { |
| 111 if (!IsMSESupported()) { | 114 if (!IsMSESupported()) { |
| 112 VLOG(0) << "Skipping test - MSE not supported."; | 115 VLOG(0) << "Skipping test - MSE not supported."; |
| 113 return; | 116 return; |
| 114 } | 117 } |
| 115 base::StringPairs query_params; | 118 base::StringPairs query_params; |
| 116 query_params.push_back(std::make_pair("videoFormat", "CLEAR_MP4")); | 119 query_params.push_back(std::make_pair("videoFormat", "CLEAR_MP4")); |
| 117 query_params.push_back(std::make_pair("audioFormat", "CLEAR_WEBM")); | 120 query_params.push_back(std::make_pair("audioFormat", "CLEAR_WEBM")); |
| 118 RunMediaTestPage("mse_different_containers.html", query_params, kEnded, true); | 121 RunMediaTestPage("mse_different_containers.html", query_params, kEnded, true); |
| 119 } | 122 } |
| 123 #endif // !defined(OS_ANDROID) |
| 120 | 124 |
| 121 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Video_WEBM_Audio_MP4) { | 125 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_Video_WEBM_Audio_MP4) { |
| 122 if (!IsMSESupported()) { | 126 if (!IsMSESupported()) { |
| 123 VLOG(0) << "Skipping test - MSE not supported."; | 127 VLOG(0) << "Skipping test - MSE not supported."; |
| 124 return; | 128 return; |
| 125 } | 129 } |
| 126 base::StringPairs query_params; | 130 base::StringPairs query_params; |
| 127 query_params.push_back(std::make_pair("videoFormat", "CLEAR_WEBM")); | 131 query_params.push_back(std::make_pair("videoFormat", "CLEAR_WEBM")); |
| 128 query_params.push_back(std::make_pair("audioFormat", "CLEAR_MP4")); | 132 query_params.push_back(std::make_pair("audioFormat", "CLEAR_MP4")); |
| 129 RunMediaTestPage("mse_different_containers.html", query_params, kEnded, true); | 133 RunMediaTestPage("mse_different_containers.html", query_params, kEnded, true); |
| 130 } | 134 } |
| 131 #endif | 135 #endif |
| 132 | 136 |
| 133 #if defined(USE_PROPRIETARY_CODECS) | 137 #if defined(USE_PROPRIETARY_CODECS) |
| 134 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) | 138 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER) |
| 135 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioVideo_Mp2t) { | 139 IN_PROC_BROWSER_TEST_F(MediaSourceTest, Playback_AudioVideo_Mp2t) { |
| 136 TestSimplePlayback("bear-1280x720.ts", kMp2tAudioVideo, kEnded); | 140 TestSimplePlayback("bear-1280x720.ts", kMp2tAudioVideo, kEnded); |
| 137 } | 141 } |
| 138 #endif | 142 #endif |
| 139 #endif | 143 #endif |
| 140 } // namespace content | 144 } // namespace content |
| OLD | NEW |