| 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;
|
| }
|
|
|