| 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 "build/build_config.h" | 9 #include "build/build_config.h" |
| 10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 | 120 |
| 121 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearOpusOgg) { | 121 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearOpusOgg) { |
| 122 PlayVideo("bear-opus.ogg", GetParam()); | 122 PlayVideo("bear-opus.ogg", GetParam()); |
| 123 } | 123 } |
| 124 | 124 |
| 125 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentWebm) { | 125 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentWebm) { |
| 126 PlayVideo("bear_silent.webm", GetParam()); | 126 PlayVideo("bear_silent.webm", GetParam()); |
| 127 } | 127 } |
| 128 | 128 |
| 129 #if defined(USE_PROPRIETARY_CODECS) | 129 #if defined(USE_PROPRIETARY_CODECS) |
| 130 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMp4) { | 130 // Crashes on Mac only. http://crbug.com/621857 |
| 131 #if defined(OS_MACOSX) |
| 132 #define MAYBE_VideoBearMp4 DISABLED_VideoBearMp4 |
| 133 #else |
| 134 #define MAYBE_VideoBearMp4 VideoBearMp4 |
| 135 #endif |
| 136 IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoBearMp4) { |
| 131 PlayVideo("bear.mp4", GetParam()); | 137 PlayVideo("bear.mp4", GetParam()); |
| 132 } | 138 } |
| 133 | 139 |
| 134 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearHighBitDepthMp4) { | 140 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearHighBitDepthMp4) { |
| 135 PlayVideo("bear-320x180-hi10p.mp4", GetParam()); | 141 PlayVideo("bear-320x180-hi10p.mp4", GetParam()); |
| 136 } | 142 } |
| 137 | 143 |
| 138 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentMp4) { | 144 // Crashes on Mac only. http://crbug.com/621857 |
| 145 #if defined(OS_MACOSX) |
| 146 #define MAYBE_VideoBearSilentMp4 DISABLED_VideoBearSilentMp4 |
| 147 #else |
| 148 #define MAYBE_VideoBearSilentMp4 VideoBearSilentMp4 |
| 149 #endif |
| 150 IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoBearSilentMp4) { |
| 139 PlayVideo("bear_silent.mp4", GetParam()); | 151 PlayVideo("bear_silent.mp4", GetParam()); |
| 140 } | 152 } |
| 141 | 153 |
| 142 // While we support the big endian (be) PCM codecs on Chromium, Quicktime seems | 154 // While we support the big endian (be) PCM codecs on Chromium, Quicktime seems |
| 143 // to be the only creator of this format and only for .mov files. | 155 // to be the only creator of this format and only for .mov files. |
| 144 // TODO(dalecurtis/ihf): Find or create some .wav test cases for "be" format. | 156 // TODO(dalecurtis/ihf): Find or create some .wav test cases for "be" format. |
| 145 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS16be) { | 157 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMovPcmS16be) { |
| 146 PlayVideo("bear_pcm_s16be.mov", GetParam()); | 158 PlayVideo("bear_pcm_s16be.mov", GetParam()); |
| 147 } | 159 } |
| 148 | 160 |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 } | 292 } |
| 281 | 293 |
| 282 #if defined(OS_CHROMEOS) | 294 #if defined(OS_CHROMEOS) |
| 283 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 295 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { |
| 284 RunColorFormatTest("yuv420p.avi", kEnded); | 296 RunColorFormatTest("yuv420p.avi", kEnded); |
| 285 } | 297 } |
| 286 #endif // defined(OS_CHROMEOS) | 298 #endif // defined(OS_CHROMEOS) |
| 287 #endif // defined(USE_PROPRIETARY_CODECS) | 299 #endif // defined(USE_PROPRIETARY_CODECS) |
| 288 | 300 |
| 289 } // namespace content | 301 } // namespace content |
| OLD | NEW |