Remove support for Intel VP9 and VP8 MFT.

media/gpu/dxva_video_decode_accelerator_win.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 "media/gpu/dxva_video_decode_accelerator_win.h"
 
 #include <memory>
 
 #if !defined(OS_WIN)
 #error This file should only be built on Windows.
@@ skipping 33 matching lines @@
 #include "media/video/video_decode_accelerator.h"
 #include "third_party/angle/include/EGL/egl.h"
 #include "third_party/angle/include/EGL/eglext.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_fence.h"
 #include "ui/gl/gl_surface_egl.h"
 
 namespace {
 
-// Path is appended on to the PROGRAM_FILES base path.
-const wchar_t kVPXDecoderDLLPath[] = L"Intel\\Media SDK\\";
-
-const wchar_t kVP8DecoderDLLName[] =
-#if defined(ARCH_CPU_X86)
-    L"mfx_mft_vp8vd_32.dll";
-#elif defined(ARCH_CPU_X86_64)
-    L"mfx_mft_vp8vd_64.dll";
-#else
-#error Unsupported Windows CPU Architecture
-#endif
-
-const wchar_t kVP9DecoderDLLName[] =
-#if defined(ARCH_CPU_X86)
-    L"mfx_mft_vp9vd_32.dll";
-#elif defined(ARCH_CPU_X86_64)
-    L"mfx_mft_vp9vd_64.dll";
-#else
-#error Unsupported Windows CPU Architecture
-#endif
-
 const wchar_t kMSVP9DecoderDLLName[] = L"MSVP9DEC.dll";
 
-const CLSID CLSID_WebmMfVp8Dec = {
-    0x451e3cb7,
-    0x2622,
-    0x4ba5,
-    {0x8e, 0x1d, 0x44, 0xb3, 0xc4, 0x1d, 0x09, 0x24}};
-
-const CLSID CLSID_WebmMfVp9Dec = {
-    0x07ab4bd2,
-    0x1979,
-    0x4fcd,
-    {0xa6, 0x97, 0xdf, 0x9a, 0xd1, 0x5b, 0x34, 0xfe}};
-
 const CLSID MEDIASUBTYPE_VP80 = {
     0x30385056,
     0x0000,
     0x0010,
     {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
 
 const CLSID MEDIASUBTYPE_VP90 = {
     0x30395056,
     0x0000,
     0x0010,
@@ skipping 1330 matching lines @@
               profile == VP9PROFILE_PROFILE1 ||
               profile == VP9PROFILE_PROFILE2 ||
               profile == VP9PROFILE_PROFILE3)) {
     if (profile != VP8PROFILE_ANY) {
       codec_ = kCodecVP9;
       clsid = CLSID_MSVPxDecoder;
       decoder_dll = ::LoadLibrary(kMSVP9DecoderDLLName);
       if (decoder_dll)
         using_ms_vp9_mft_ = true;
     }
-    if (!decoder_dll) {
-      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(program_files_key, &dll_path),
-                        "failed to get path for Program Files", false);
-
-      dll_path = dll_path.Append(kVPXDecoderDLLPath);
-      if (profile == VP8PROFILE_ANY) {
-        codec_ = kCodecVP8;
-        dll_path = dll_path.Append(kVP8DecoderDLLName);
-        clsid = CLSID_WebmMfVp8Dec;
-      } else {
-        codec_ = kCodecVP9;
-        dll_path = dll_path.Append(kVP9DecoderDLLName);
-        clsid = CLSID_WebmMfVp9Dec;
-      }
-      decoder_dll = ::LoadLibraryEx(dll_path.value().data(), NULL,
-                                    LOAD_WITH_ALTERED_SEARCH_PATH);
-    }
     RETURN_ON_FAILURE(decoder_dll, "vpx decoder dll is not loaded", false);
   } else {
     RETURN_ON_FAILURE(false, "Unsupported codec.", false);
   }
 
   HRESULT hr = CreateCOMObjectFromDll(
       decoder_dll, clsid, __uuidof(IMFTransform), decoder_.ReceiveVoid());
   RETURN_ON_HR_FAILURE(hr, "Failed to create decoder instance", false);
 
   RETURN_ON_FAILURE(CheckDecoderDxvaSupport(),
@@ skipping 1295 matching lines @@
   SetState(kConfigChange);
   Invalidate();
   Initialize(config_, client_);
   decoder_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DXVAVideoDecodeAccelerator::DecodePendingInputBuffers,
                  base::Unretained(this)));
 }
 
 }  // namespace media