| 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 "content/browser/media/media_browsertest.h" | 5 #include "content/browser/media/media_browsertest.h" |
| 6 | 6 |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "content/public/browser/web_contents.h" | 9 #include "content/public/browser/web_contents.h" |
| 10 #include "content/public/test/browser_test_utils.h" | 10 #include "content/public/test/browser_test_utils.h" |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 std::string expected; | 103 std::string expected; |
| 104 expected += base::IntToString(width); | 104 expected += base::IntToString(width); |
| 105 expected += " "; | 105 expected += " "; |
| 106 expected += base::IntToString(height); | 106 expected += base::IntToString(height); |
| 107 media::QueryParams query_params; | 107 media::QueryParams query_params; |
| 108 query_params.push_back(std::make_pair("video", media_file)); | 108 query_params.push_back(std::make_pair("video", media_file)); |
| 109 RunMediaTestPage("player.html", query_params, expected, false); | 109 RunMediaTestPage("player.html", query_params, expected, false); |
| 110 } | 110 } |
| 111 }; | 111 }; |
| 112 | 112 |
| 113 // http://crbug.com/407452 | |
| 114 #if !defined(THREAD_SANITIZER) | |
| 115 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearTheora) { | 113 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearTheora) { |
| 116 PlayVideo("bear.ogv", GetParam()); | 114 PlayVideo("bear.ogv", GetParam()); |
| 117 } | 115 } |
| 118 | 116 |
| 119 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentTheora) { | 117 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentTheora) { |
| 120 PlayVideo("bear_silent.ogv", GetParam()); | 118 PlayVideo("bear_silent.ogv", GetParam()); |
| 121 } | 119 } |
| 122 | 120 |
| 123 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWebm) { | 121 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWebm) { |
| 124 PlayVideo("bear.webm", GetParam()); | 122 PlayVideo("bear.webm", GetParam()); |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) { | 227 IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) { |
| 230 PlayVideo("tulip2.webm", GetParam()); | 228 PlayVideo("tulip2.webm", GetParam()); |
| 231 } | 229 } |
| 232 | 230 |
| 233 // Covers tear-down when navigating away as opposed to browser exiting. | 231 // Covers tear-down when navigating away as opposed to browser exiting. |
| 234 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { | 232 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { |
| 235 PlayVideo("bear.ogv", false); | 233 PlayVideo("bear.ogv", false); |
| 236 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); | 234 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); |
| 237 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); | 235 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); |
| 238 } | 236 } |
| 239 #endif // !defined(THREAD_SANITIZER) | |
| 240 | 237 |
| 241 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); | 238 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); |
| 242 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); | 239 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); |
| 243 | 240 |
| 244 // http://crbug.com/407452 | |
| 245 #if !defined(THREAD_SANITIZER) | |
| 246 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) { | 241 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pTheora)) { |
| 247 RunColorFormatTest("yuv420p.ogv", kEnded); | 242 RunColorFormatTest("yuv420p.ogv", kEnded); |
| 248 } | 243 } |
| 249 | 244 |
| 250 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pTheora)) { | 245 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pTheora)) { |
| 251 RunColorFormatTest("yuv422p.ogv", kEnded); | 246 RunColorFormatTest("yuv422p.ogv", kEnded); |
| 252 } | 247 } |
| 253 | 248 |
| 254 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pTheora)) { | 249 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pTheora)) { |
| 255 RunColorFormatTest("yuv444p.ogv", kEnded); | 250 RunColorFormatTest("yuv444p.ogv", kEnded); |
| 256 } | 251 } |
| 257 | 252 |
| 258 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pVp8)) { | 253 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pVp8)) { |
| 259 RunColorFormatTest("yuv420p.webm", kEnded); | 254 RunColorFormatTest("yuv420p.webm", kEnded); |
| 260 } | 255 } |
| 261 | 256 |
| 262 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pVp9)) { | 257 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pVp9)) { |
| 263 RunColorFormatTest("yuv444p.webm", "ENDED"); | 258 RunColorFormatTest("yuv444p.webm", "ENDED"); |
| 264 } | 259 } |
| 265 | 260 |
| 266 #endif // !defined(THREAD_SANITIZER) | |
| 267 | |
| 268 #if defined(USE_PROPRIETARY_CODECS) | 261 #if defined(USE_PROPRIETARY_CODECS) |
| 269 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pH264)) { | 262 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv420pH264)) { |
| 270 RunColorFormatTest("yuv420p.mp4", kEnded); | 263 RunColorFormatTest("yuv420p.mp4", kEnded); |
| 271 } | 264 } |
| 272 | 265 |
| 273 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuvj420pH264)) { | 266 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuvj420pH264)) { |
| 274 RunColorFormatTest("yuvj420p.mp4", kEnded); | 267 RunColorFormatTest("yuvj420p.mp4", kEnded); |
| 275 } | 268 } |
| 276 | 269 |
| 277 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pH264)) { | 270 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv422pH264)) { |
| 278 RunColorFormatTest("yuv422p.mp4", kEnded); | 271 RunColorFormatTest("yuv422p.mp4", kEnded); |
| 279 } | 272 } |
| 280 | 273 |
| 281 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pH264)) { | 274 IN_PROC_BROWSER_TEST_F(MediaTest, MAYBE(Yuv444pH264)) { |
| 282 RunColorFormatTest("yuv444p.mp4", kEnded); | 275 RunColorFormatTest("yuv444p.mp4", kEnded); |
| 283 } | 276 } |
| 284 | 277 |
| 285 #if defined(OS_CHROMEOS) | 278 #if defined(OS_CHROMEOS) |
| 286 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 279 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { |
| 287 RunColorFormatTest("yuv420p.avi", kEnded); | 280 RunColorFormatTest("yuv420p.avi", kEnded); |
| 288 } | 281 } |
| 289 #endif // defined(OS_CHROMEOS) | 282 #endif // defined(OS_CHROMEOS) |
| 290 #endif // defined(USE_PROPRIETARY_CODECS) | 283 #endif // defined(USE_PROPRIETARY_CODECS) |
| 291 | 284 |
| 292 } // namespace content | 285 } // namespace content |
| OLD | NEW |