diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 20:55:06 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 20:55:06 +0000 |
| commit | 51ce34eab4a225db84827701a42ccad0850edcd4 (patch) | |
| tree | ee4d4ceee9c7e8cdd3b788b68d427a427c6b6e88 /remoting/base | |
| parent | 1045d07f06e346e7513a50a96d115446c3943bb8 (diff) | |
| download | chromium_src-51ce34eab4a225db84827701a42ccad0850edcd4.zip chromium_src-51ce34eab4a225db84827701a42ccad0850edcd4.tar.gz chromium_src-51ce34eab4a225db84827701a42ccad0850edcd4.tar.bz2 | |
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
Diffstat (limited to 'remoting/base')
| -rw-r--r-- | remoting/base/decoder_vp8.cc | 9 | ||||
| -rw-r--r-- | remoting/base/encoder_vp8.cc | 10 |
2 files changed, 8 insertions, 11 deletions
diff --git a/remoting/base/decoder_vp8.cc b/remoting/base/decoder_vp8.cc index fc89503..b150c4b 100644 --- a/remoting/base/decoder_vp8.cc +++ b/remoting/base/decoder_vp8.cc @@ -10,9 +10,9 @@ extern "C" { #define VPX_CODEC_DISABLE_COMPAT 1 -#include "third_party/libvpx/include/vpx/vpx_codec.h" -#include "third_party/libvpx/include/vpx/vpx_decoder.h" -#include "third_party/libvpx/include/vpx/vp8dx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8dx.h" } namespace remoting { @@ -52,8 +52,7 @@ Decoder::DecodeResult DecoderVp8::DecodePacket(const VideoPacket* packet) { codec_ = new vpx_codec_ctx_t(); vpx_codec_err_t ret = vpx_codec_dec_init( - codec_, - (const vpx_codec_iface_t*)media::GetVp8DxAlgoAddress(), NULL, 0); + codec_, vpx_codec_vp8_dx(), NULL, 0); if (ret != VPX_CODEC_OK) { LOG(INFO) << "Cannot initialize codec."; delete codec_; diff --git a/remoting/base/encoder_vp8.cc b/remoting/base/encoder_vp8.cc index 6d07e54..24d6ba4 100644 --- a/remoting/base/encoder_vp8.cc +++ b/remoting/base/encoder_vp8.cc @@ -6,15 +6,14 @@ #include "base/logging.h" #include "media/base/callback.h" -#include "media/base/media.h" #include "remoting/base/capture_data.h" #include "remoting/proto/video.pb.h" extern "C" { #define VPX_CODEC_DISABLE_COMPAT 1 -#include "third_party/libvpx/include/vpx/vpx_codec.h" -#include "third_party/libvpx/include/vpx/vpx_encoder.h" -#include "third_party/libvpx/include/vpx/vp8cx.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_codec.h" +#include "third_party/libvpx/source/libvpx/vpx/vpx_encoder.h" +#include "third_party/libvpx/source/libvpx/vpx/vp8cx.h" } namespace remoting { @@ -47,8 +46,7 @@ bool EncoderVp8::Init(int width, int height) { image_->h = height; vpx_codec_enc_cfg_t config; - const vpx_codec_iface_t* algo = - (const vpx_codec_iface_t*)media::GetVp8CxAlgoAddress(); + const vpx_codec_iface_t* algo = vpx_codec_vp8_cx(); CHECK(algo); vpx_codec_err_t ret = vpx_codec_enc_config_default(algo, &config, 0); if (ret != VPX_CODEC_OK) |