Chromium Code Reviews| Index: content/common/gpu/media/dxva_video_decode_accelerator.cc |
| diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.cc b/content/common/gpu/media/dxva_video_decode_accelerator.cc |
| index 25aae5c56163b8cc2517c0e07e72a6c62cacb12e..54eb821e49c1d8a56955d8b87cd0ebaf27c8af16 100644 |
| --- a/content/common/gpu/media/dxva_video_decode_accelerator.cc |
| +++ b/content/common/gpu/media/dxva_video_decode_accelerator.cc |
| @@ -940,9 +940,16 @@ bool DXVAVideoDecodeAccelerator::InitDecoder(media::VideoCodecProfile profile) { |
| codec_ = media::kCodecH264; |
| } else if (profile == media::VP8PROFILE_ANY || |
| profile == media::VP9PROFILE_ANY) { |
| + int program_files_key = base::DIR_PROGRAM_FILES; |
| + if (base::win::OSInfo::GetInstance()->wow64_status() == |
| + base::win::OSInfo::WOW64_ENABLED) { |
|
DaleCurtis
2015/03/25 22:19:28
Indent seems wrong?
ananta
2015/03/25 22:54:55
Fixed. Thanks
|
| + program_files_key = base::DIR_PROGRAM_FILES6432; |
| + } |
| + |
| base::FilePath dll_path; |
| - RETURN_ON_FAILURE(PathService::Get(base::DIR_PROGRAM_FILES6432, &dll_path), |
| - "failed to get path for DIR_PROGRAM_FILES6432", false); |
| + RETURN_ON_FAILURE(PathService::Get(program_files_key, &dll_path), |
| + "failed to get path for Program Files", false); |
| + |
| dll_path = dll_path.Append(kVPXDecoderDLLPath); |
| if (profile == media::VP8PROFILE_ANY) { |
| codec_ = media::kCodecVP8; |