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

Unified Diff: content/common/gpu/media/video_decode_accelerator_unittest.cc

Issue 1784193003: content gpu refactor: get rid of gpu related content switches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the compile problem on windows Created 4 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 side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/media/video_decode_accelerator_unittest.cc
diff --git a/content/common/gpu/media/video_decode_accelerator_unittest.cc b/content/common/gpu/media/video_decode_accelerator_unittest.cc
index eeb89d1728a9cab03ec2d2bf708fbf97d25b5306..78ea8ba2c6d564e509b452686c0607a1b8d6ecff 100644
--- a/content/common/gpu/media/video_decode_accelerator_unittest.cc
+++ b/content/common/gpu/media/video_decode_accelerator_unittest.cc
@@ -520,11 +520,15 @@ scoped_ptr<media::VideoDecodeAccelerator>
GLRenderingVDAClient::CreateDXVAVDA() {
scoped_ptr<media::VideoDecodeAccelerator> decoder;
#if defined(OS_WIN)
- if (base::win::GetVersion() >= base::win::VERSION_WIN7)
- decoder.reset(
- new DXVAVideoDecodeAccelerator(
- base::Bind(&DoNothingReturnTrue),
- rendering_helper_->GetGLContext().get()));
+ if (base::win::GetVersion() >= base::win::VERSION_WIN7) {
+ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+ const bool enable_accelerated_vpx_decode =
+ cmd_line->HasSwitch(switches::kEnableAcceleratedVpxDecode);
+ decoder.reset(new DXVAVideoDecodeAccelerator(
+ base::Bind(&DoNothingReturnTrue),
+ rendering_helper_->GetGLContext().get(),
+ enable_accelerated_vpx_decode));
+ }
#endif
return decoder;
}
« no previous file with comments | « content/common/gpu/media/vaapi_wrapper.cc ('k') | content/common/gpu/media/vt_video_decode_accelerator_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698