Remove GetVp8CxAlgoAddress hack

libvpx has introduced vpx_codec_vp8_cx() and vpx_codec_vp8_dx() use them
instead.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/5831006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69745 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 26 deletions

diff --git a/media/base/media_win.cc b/media/base/media_win.cc
index 75c8d29..87a9aa3 100644
--- a/media/base/media_win.cc
+++ b/media/base/media_win.cc
@@ -48,12 +48,6 @@ FilePath::CharType* GetDLLName(FFmpegDLLKeys dll_key) {
 
 }  // namespace
 
-// Address of vpx_codec_vp8_cx_algo.
-static void* vp8_cx_algo_address = NULL;
-
-// Address of vpx_codec_vp8_dx_algo.
-static void* vp8_dx_algo_address = NULL;
-
 // Attempts to initialize the media library (loading DLLs, DSOs, etc.).
 // Returns true if everything was successfully initialized, false otherwise.
 bool InitializeMediaLibrary(const FilePath& base_path) {
@@ -85,18 +79,6 @@ bool InitializeMediaLibrary(const FilePath& base_path) {
 #endif
   }
 
-  // TODO(hclam): This is temporary to obtain address of
-  // vpx_codec_vp8_cx_algo. This should be removed once libvpx has a
-  // getter method for it.
-  base::NativeLibrary avcodec_lib =
-      base::LoadNativeLibrary(FilePath(GetDLLName(media::FILE_LIBAVCODEC)));
-  if (avcodec_lib) {
-    vp8_cx_algo_address = base::GetFunctionPointerFromNativeLibrary(
-        avcodec_lib, "vpx_codec_vp8_cx_algo");
-    vp8_dx_algo_address = base::GetFunctionPointerFromNativeLibrary(
-        avcodec_lib, "vpx_codec_vp8_dx_algo");
-  }
-
   // Check that we loaded all libraries successfully.  We only need to check the
   // last array element because the loop above will break without initializing
   // it on any prior error.
@@ -116,12 +98,4 @@ bool InitializeOpenMaxLibrary(const FilePath& module_dir) {
   return false;
 }
 
-void* GetVp8CxAlgoAddress() {
-  return vp8_cx_algo_address;
-}
-
-void* GetVp8DxAlgoAddress() {
-  return vp8_dx_algo_address;
-}
-
 }  // namespace media