GNOME Bugzilla – Bug 619172
[vp8] exclude dec/enc based on CONFIG_VP8_DECODER/ENCODER
Last modified: 2010-05-21 08:19:44 UTC
Created attachment 161524 [details] [review] patch This may not be very autotoolish, but works with libvpx in the state that libvpx is actually in. Moved the debug init to the elements themselves to minimize amount of #ifdefs Incidentally, Opera needs this as we don't much like shipping an encoder we don't use :)
vpx_config.h is not meant to be installed AFAIK (and make install of libvpx doesn't). It's like autoconf's config.h, i.e. for build time configuration of libvpx. Better would probably be a configure check for the decoder and encoder symbols vpx_codec_vp8_cx_algo and vpx_codec_vp8_dx_algo.
commit d3c9d84fdff9e411e345ce41508f8ed6813760fb Author: Sebastian Dröge <sebastian.droege@collabora.co.uk> Date: Thu May 20 16:49:03 2010 +0200 vp8: Only enable the encoder or decoder if it's available in libvpx Fixes bug #619172. commit e428c10605560f652a1d84e2eced837ad08f262b Author: Philip Jägenstedt <philipj@opera.com> Date: Thu May 20 10:19:54 2010 +0200 vp8: exlcude dec/enc based on CONFIG_VP8_DECODER/ENCODER This may not be very autotoolish, but works with libvpx in the state that libvpx is actually in. Moved the debug init to the elements themselves to minimize amount of #ifdefs
Created attachment 161604 [details] [review] fixup
Not quite there yet, the link test fails unless you have -lpthread. I threw -lm in there too as I know vpx needs it and I've had issues with it when compiling on a backported branch. Won't hurt.
Created attachment 161605 [details] [review] fixup 2 Oops, found another bug, see commit message.
Ignore fixup/fixup 2, got the wrong author by using git commit -c, trying again...
Don't worry, I've corrected the author :)
commit 54e6f65ef3e335406e1f210c81b3afe007f12650 Author: Philip Jägenstedt <philipj@opera.com> Date: Fri May 21 08:13:06 2010 +0200 vp8: move #ifdef HAVE_VP8_ENCODER/DECODER Otherwise we'll try including e.g. <vpx/vp8cx.h> which doesn't exist. commit 1e5f37165071977c8338f7125c79846de5d47d6e Author: Philip Jägenstedt <philipj@opera.com> Date: Thu May 20 16:49:03 2010 +0200 vp8: link with -lm -lpthread when testing for vp8 encoder/decoder Fixup for bug #619172.
(In reply to comment #3) > Created an attachment (id=161604) [details] [review] > fixup I'm not 100% sure if -lpthread is correct on Windows too...
Oh, you're awake already :) I was getting tired of the patch attachment game, so there's a 3rd related fix at the tip of branch 20100521-opera-vp8 in git://sourcecode.opera.com/gstreamer/gst-plugins-bad.git ripe for the picking. I'll also push the coming QoS fixes there, so it might be more convenient for both of us.
Ok thanks, I'll merge things from there then :)