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

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

Issue 2742383006: Display: set color_depth and depth_per_component value based on kEnableHDROutput (Closed)
Patch Set: rebase Created 3 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "content/browser/media/media_browsertest.h" 11 #include "content/browser/media/media_browsertest.h"
12 #include "content/public/test/browser_test_utils.h" 12 #include "content/public/test/browser_test_utils.h"
13 #include "content/public/test/content_browser_test_utils.h" 13 #include "content/public/test/content_browser_test_utils.h"
14 #include "content/shell/browser/shell.h" 14 #include "content/shell/browser/shell.h"
15 #include "media/base/media_switches.h" 15 #include "media/base/media_switches.h"
16 #include "media/media_features.h" 16 #include "media/media_features.h"
17 #include "ui/base/ui_base_switches.h" 17 #include "ui/display/display_switches.h"
18 18
19 #if defined(OS_ANDROID) 19 #if defined(OS_ANDROID)
20 #include "base/android/build_info.h" 20 #include "base/android/build_info.h"
21 #endif 21 #endif
22 22
23 const char kProbably[] = "probably"; 23 const char kProbably[] = "probably";
24 const char kMaybe[] = "maybe"; 24 const char kMaybe[] = "maybe";
25 const char kNot[] = ""; 25 const char kNot[] = "";
26 26
27 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 27 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
(...skipping 1547 matching lines...) Expand 10 before | Expand all | Expand 10 after
1575 {switches::kEnableNewVp9CodecString, "video/mp4", kNot, kNot}, 1575 {switches::kEnableNewVp9CodecString, "video/mp4", kNot, kNot},
1576 {switches::kEnableHDR, "video/webm", kProbably, kMaybe}, 1576 {switches::kEnableHDR, "video/webm", kProbably, kMaybe},
1577 {switches::kEnableNewVp9CodecString, "video/webm", kProbably, kMaybe}, 1577 {switches::kEnableNewVp9CodecString, "video/webm", kProbably, kMaybe},
1578 }; 1578 };
1579 1579
1580 INSTANTIATE_TEST_CASE_P(CodecSupportTest_NewVp9String, 1580 INSTANTIATE_TEST_CASE_P(CodecSupportTest_NewVp9String,
1581 MediaCanPlayNewVp9TypeTest, 1581 MediaCanPlayNewVp9TypeTest,
1582 ::testing::ValuesIn(kNewVp9ParamVariants)); 1582 ::testing::ValuesIn(kNewVp9ParamVariants));
1583 1583
1584 } // namespace content 1584 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | content/browser/renderer_host/render_view_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698