Bug 709721 - Part 2: Access vpx_codec_vp8_dx_algo through the function accessor to make things work cross-modules. r=cpearce
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 15 Dec 2011 06:40:22 +0100
changeset 82626 9a591b2904316d6eff7b38556b5c83c9fac96a1c
parent 82625 9123d35faa6cb445bf6f10eb38f57b0d6c76d0f7
child 82627 beac1650953419b86ca133e9374d10ec456d2aaa
push id21690
push usermh@glandium.org
push dateThu, 15 Dec 2011 06:10:30 +0000
treeherdermozilla-central@beac16509534 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs709721
milestone11.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 709721 - Part 2: Access vpx_codec_vp8_dx_algo through the function accessor to make things work cross-modules. r=cpearce
content/media/webm/nsWebMReader.cpp
layout/media/symbols.def
--- a/content/media/webm/nsWebMReader.cpp
+++ b/content/media/webm/nsWebMReader.cpp
@@ -156,17 +156,17 @@ nsWebMReader::~nsWebMReader()
   vorbis_info_clear(&mVorbisInfo);
   vorbis_comment_clear(&mVorbisComment);
 
   MOZ_COUNT_DTOR(nsWebMReader);
 }
 
 nsresult nsWebMReader::Init(nsBuiltinDecoderReader* aCloneDonor)
 {
-  if (vpx_codec_dec_init(&mVP8, &vpx_codec_vp8_dx_algo, NULL, 0)) {
+  if (vpx_codec_dec_init(&mVP8, vpx_codec_vp8_dx(), NULL, 0)) {
     return NS_ERROR_FAILURE;
   }
 
   vorbis_info_init(&mVorbisInfo);
   vorbis_comment_init(&mVorbisComment);
   memset(&mVorbisDsp, 0, sizeof(vorbis_dsp_state));
   memset(&mVorbisBlock, 0, sizeof(vorbis_block));
 
@@ -664,17 +664,17 @@ bool nsWebMReader::DecodeVideoFrame(bool
     r = nestegg_packet_data(packet, i, &data, &length);
     if (r == -1) {
       return false;
     }
 
     vpx_codec_stream_info_t si;
     memset(&si, 0, sizeof(si));
     si.sz = sizeof(si);
-    vpx_codec_peek_stream_info(&vpx_codec_vp8_dx_algo, data, length, &si);
+    vpx_codec_peek_stream_info(vpx_codec_vp8_dx(), data, length, &si);
     if (aKeyframeSkip && (!si.is_kf || tstamp_usecs < aTimeThreshold)) {
       // Skipping to next keyframe...
       parsed++; // Assume 1 frame per chunk.
       continue;
     }
 
     if (aKeyframeSkip && si.is_kf) {
       aKeyframeSkip = false;
--- a/layout/media/symbols.def
+++ b/layout/media/symbols.def
@@ -71,9 +71,9 @@ vorbis_synthesis_init
 vorbis_synthesis_pcmout
 vorbis_synthesis_read
 vorbis_synthesis_restart
 vpx_codec_dec_init_ver
 vpx_codec_decode
 vpx_codec_destroy
 vpx_codec_get_frame
 vpx_codec_peek_stream_info
-vpx_codec_vp8_dx_algo
+vpx_codec_vp8_dx