| 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/string16.h" | 7 #include "base/string16.h" |
| 8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 PlayVideo("bear_pcm_s24be.mov", GetParam()); | 116 PlayVideo("bear_pcm_s24be.mov", GetParam()); |
| 117 } | 117 } |
| 118 #endif | 118 #endif |
| 119 | 119 |
| 120 #if defined(OS_CHROMEOS) | 120 #if defined(OS_CHROMEOS) |
| 121 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) | 121 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) |
| 122 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Mpeg4) { | 122 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Mpeg4) { |
| 123 PlayVideo("bear_mpeg4_mp3.avi", GetParam()); | 123 PlayVideo("bear_mpeg4_mp3.avi", GetParam()); |
| 124 } | 124 } |
| 125 | 125 |
| 126 // TODO(scherkus): MPEG-4 ASP contains B-frames and out-of-order decoding, which | 126 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Mpeg4Asp) { |
| 127 // makes FFmpeg spit out video frames with no timestamp. As a result we DCHECK() | |
| 128 // all over the place http://crbug.com/169570 | |
| 129 IN_PROC_BROWSER_TEST_P(MediaTest, DISABLED_VideoBearAviMp3Mpeg4Asp) { | |
| 130 PlayVideo("bear_mpeg4asp_mp3.avi", GetParam()); | 127 PlayVideo("bear_mpeg4asp_mp3.avi", GetParam()); |
| 131 } | 128 } |
| 132 | 129 |
| 133 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Divx) { | 130 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearAviMp3Divx) { |
| 134 PlayVideo("bear_divx_mp3.avi", GetParam()); | 131 PlayVideo("bear_divx_mp3.avi", GetParam()); |
| 135 } | 132 } |
| 136 | 133 |
| 137 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAacH264) { | 134 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAacH264) { |
| 138 PlayVideo("bear_h264_aac.3gp", GetParam()); | 135 PlayVideo("bear_h264_aac.3gp", GetParam()); |
| 139 } | 136 } |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 } | 232 } |
| 236 | 233 |
| 237 #if defined(OS_CHROMEOS) | 234 #if defined(OS_CHROMEOS) |
| 238 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 235 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { |
| 239 RunColorFormatTest("yuv420p.avi", "ENDED"); | 236 RunColorFormatTest("yuv420p.avi", "ENDED"); |
| 240 } | 237 } |
| 241 #endif | 238 #endif |
| 242 #endif | 239 #endif |
| 243 | 240 |
| 244 } // namespace content | 241 } // namespace content |
| OLD | NEW |