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

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

Issue 1031263002: Ensure that the DXVA decoder for VP8 and VP9 picks up the path for the HMFT correctly on non WOW64 … (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed indent Created 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..801ff578f5ecd3ae96614e5f6cf248f96e9a6ebc 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) {
+ 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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698