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

3 files changed, 0 insertions, 64 deletions

diff --git a/media/base/media.h b/media/base/media.h
index 21dc6c2..3d1a83a 100644
--- a/media/base/media.h
+++ b/media/base/media.h
@@ -25,18 +25,6 @@ bool InitializeMediaLibrary(const FilePath& module_dir);
 // Returns true if OpenMAX was successfully initialized and loaded.
 bool InitializeOpenMaxLibrary(const FilePath& module_dir);
 
-// This is temporary to get the address of vpx_codec_vp8_cx_algo in FFmpeg.
-// This method should only be called after media library is loaded.
-// TODO(hclam): Remove this after we have a getter function for the same
-// purpose in libvpx.
-void* GetVp8CxAlgoAddress();
-
-// This is temporary to get the address of vpx_codec_vp8_dx_algo in FFmpeg.
-// This method should only be called after media library is loaded.
-// TODO(hclam): Remove this after we have a getter function for the same
-// purpose in libvpx.
-void* GetVp8DxAlgoAddress();
-
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_H_
diff --git a/media/base/media_posix.cc b/media/base/media_posix.cc
index 272e9e6..438155a 100644
--- a/media/base/media_posix.cc
+++ b/media/base/media_posix.cc
@@ -68,12 +68,6 @@ std::string GetDSOName(tp_ffmpeg::StubModules stub_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 DSOs, etc.).
 // Returns true if everything was successfully initialized, false otherwise.
 bool InitializeMediaLibrary(const FilePath& module_dir) {
@@ -91,18 +85,6 @@ bool InitializeMediaLibrary(const FilePath& module_dir) {
   }
 
   bool ret = tp_ffmpeg::InitializeStubs(paths);
-
-  // 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 sumo_lib =
-      base::LoadNativeLibrary(module_dir.Append(sumo_name));
-  if (sumo_lib) {
-    vp8_cx_algo_address = base::GetFunctionPointerFromNativeLibrary(
-        sumo_lib, "vpx_codec_vp8_cx_algo");
-    vp8_dx_algo_address = base::GetFunctionPointerFromNativeLibrary(
-        sumo_lib, "vpx_codec_vp8_dx_algo");
-  }
   return ret;
 }
 
@@ -132,12 +114,4 @@ bool InitializeOpenMaxLibrary(const FilePath& module_dir) {
 }
 #endif
 
-void* GetVp8CxAlgoAddress() {
-  return vp8_cx_algo_address;
-}
-
-void* GetVp8DxAlgoAddress() {
-  return vp8_dx_algo_address;
-}
-
 }  // namespace media
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