| 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/stringprintf.h" | 7 #include "base/strings/stringprintf.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/common/url_constants.h" | 10 #include "content/public/common/url_constants.h" | 
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 161 } | 161 } | 
| 162 | 162 | 
| 163 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) { | 163 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) { | 
| 164   PlayVideo("bear_mpeg4_amrnb.3gp", GetParam()); | 164   PlayVideo("bear_mpeg4_amrnb.3gp", GetParam()); | 
| 165 } | 165 } | 
| 166 | 166 | 
| 167 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { | 167 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { | 
| 168   PlayAudio("bear_gsm_ms.wav", GetParam()); | 168   PlayAudio("bear_gsm_ms.wav", GetParam()); | 
| 169 } | 169 } | 
| 170 | 170 | 
| 171 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { |  | 
| 172   PlayAudio("bear_mulaw.wav", GetParam()); |  | 
| 173 } |  | 
| 174 |  | 
| 175 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { | 171 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { | 
| 176   PlayAudio("bear.flac", GetParam()); | 172   PlayAudio("bear.flac", GetParam()); | 
| 177 } | 173 } | 
| 178 #endif | 174 #endif | 
| 179 #endif | 175 #endif | 
| 180 | 176 | 
|  | 177 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavAlaw) { | 
|  | 178   PlayAudio("bear_alaw.wav", GetParam()); | 
|  | 179 } | 
|  | 180 | 
|  | 181 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { | 
|  | 182   PlayAudio("bear_mulaw.wav", GetParam()); | 
|  | 183 } | 
|  | 184 | 
| 181 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { | 185 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { | 
| 182   PlayAudio("bear_pcm.wav", GetParam()); | 186   PlayAudio("bear_pcm.wav", GetParam()); | 
| 183 } | 187 } | 
| 184 | 188 | 
| 185 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm3kHz) { | 189 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm3kHz) { | 
| 186   PlayAudio("bear_3kHz.wav", GetParam()); | 190   PlayAudio("bear_3kHz.wav", GetParam()); | 
| 187 } | 191 } | 
| 188 | 192 | 
| 189 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm192kHz) { | 193 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm192kHz) { | 
| 190   PlayAudio("bear_192kHz.wav", GetParam()); | 194   PlayAudio("bear_192kHz.wav", GetParam()); | 
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 241 } | 245 } | 
| 242 | 246 | 
| 243 #if defined(OS_CHROMEOS) | 247 #if defined(OS_CHROMEOS) | 
| 244 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 248 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { | 
| 245   RunColorFormatTest("yuv420p.avi", "ENDED"); | 249   RunColorFormatTest("yuv420p.avi", "ENDED"); | 
| 246 } | 250 } | 
| 247 #endif  // defined(OS_CHROMEOS) | 251 #endif  // defined(OS_CHROMEOS) | 
| 248 #endif  // defined(USE_PROPRIETARY_CODECS) | 252 #endif  // defined(USE_PROPRIETARY_CODECS) | 
| 249 | 253 | 
| 250 }  // namespace content | 254 }  // namespace content | 
| OLD | NEW | 
|---|