Ensure that the DXVA decoder for VP8 and VP9 picks up the path for the HMFT correctly on non WOW64 …

content/common/gpu/media/dxva_video_decode_accelerator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 
 #if !defined(OS_WIN)
 #error This file should only be built on Windows.
 #endif   // !defined(OS_WIN)
 
@@ skipping 922 matching lines @@
     RETURN_ON_FAILURE(version_info,
                       "unable to get version of msmpeg2vdec.dll",
                       false);
     base::string16 file_version = version_info->file_version();
     RETURN_ON_FAILURE(file_version.find(L"6.1.7140") == base::string16::npos,
                       "blacklisted version of msmpeg2vdec.dll 6.7.7140",
                       false);
     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;
       dll_path = dll_path.Append(kVP8DecoderDLLName);
     } else {
       codec_ = media::kCodecVP9;
       dll_path = dll_path.Append(kVP9DecoderDLLName);
     }
     decoder_dll = ::LoadLibraryEx(dll_path.value().data(), NULL,
         LOAD_WITH_ALTERED_SEARCH_PATH);
@@ skipping 1196 matching lines @@
     D3DSURFACE_DESC surface_desc;
     hr = surface->GetDesc(&surface_desc);
     RETURN_ON_HR_FAILURE(hr, "Failed to get surface description", false);
     *width = surface_desc.Width;
     *height = surface_desc.Height;
   }
   return true;
 }
 
 }  // namespace content