Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Side by Side Diff: content/browser/media/media_browsertest.cc

Issue 2370453003: 12-bit vp9 video support (Closed)
Patch Set: comments addressed + comment added Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentWebm) { 127 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentWebm) {
128 PlayVideo("bear_silent.webm", GetParam()); 128 PlayVideo("bear_silent.webm", GetParam());
129 } 129 }
130 130
131 // We don't expect android devices to support highbit yet. 131 // We don't expect android devices to support highbit yet.
132 #if defined(ARCH_CPU_X86_FAMILY) && !defined(OS_ANDROID) 132 #if defined(ARCH_CPU_X86_FAMILY) && !defined(OS_ANDROID)
133 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearHighBitDepthVP9) { 133 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearHighBitDepthVP9) {
134 PlayVideo("bear-320x180-hi10p-vp9.webm", GetParam()); 134 PlayVideo("bear-320x180-hi10p-vp9.webm", GetParam());
135 } 135 }
136
137 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear12DepthVP9) {
138 PlayVideo("bear-320x180-hi12p-vp9.webm", GetParam());
139 }
136 #endif 140 #endif
137 141
138 #if defined(USE_PROPRIETARY_CODECS) 142 #if defined(USE_PROPRIETARY_CODECS)
139 // Crashes on Mac only. http://crbug.com/621857 143 // Crashes on Mac only. http://crbug.com/621857
140 #if defined(OS_MACOSX) 144 #if defined(OS_MACOSX)
141 #define MAYBE_VideoBearMp4 DISABLED_VideoBearMp4 145 #define MAYBE_VideoBearMp4 DISABLED_VideoBearMp4
142 #else 146 #else
143 #define MAYBE_VideoBearMp4 VideoBearMp4 147 #define MAYBE_VideoBearMp4 VideoBearMp4
144 #endif 148 #endif
145 IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoBearMp4) { 149 IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoBearMp4) {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { 256 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
253 PlayVideo("bear.webm", false); 257 PlayVideo("bear.webm", false);
254 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); 258 NavigateToURL(shell(), GURL(url::kAboutBlankURL));
255 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); 259 EXPECT_FALSE(shell()->web_contents()->IsCrashed());
256 } 260 }
257 261
258 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); 262 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
259 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); 263 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
260 264
261 } // namespace content 265 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698