From 17492d5e40e11e3ae27fe82f84e5176c551bab65 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 10 Jun 2009 20:50:53 +0000 Subject: [PATCH] Add code to enable and disable all VAAPI and VDPAU parts. As a positive sideeffect, VAAPI/VDPAU objects need no longer be listed for all VAAPI/VDPAU-related decoders. Originally committed as revision 19145 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 15 +++++++++++++++ libavcodec/Makefile | 22 ++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/configure b/configure index ad33c79411..5136751094 100755 --- a/configure +++ b/configure @@ -101,6 +101,8 @@ show_help(){ echo " --disable-golomb disable Golomb code" echo " --disable-mdct disable MDCT code" echo " --disable-rdft disable RDFT code" + echo " --disable-vaapi disable VAAPI code" + echo " --disable-vdpau disable VDPAU code" echo " --enable-runtime-cpudetect detect cpu capabilities at runtime (bigger binary)" echo " --enable-hardcoded-tables use hardcoded tables instead of runtime generation" echo " --enable-memalign-hack emulate memalign, interferes with memory debuggers" @@ -817,6 +819,8 @@ CONFIG_LIST=" small static swscale_alpha + vaapi + vdpau version3 x11grab zlib @@ -1032,10 +1036,13 @@ flv_encoder_select="aandct" h261_encoder_select="aandct" h263_encoder_select="aandct" h263_vaapi_hwaccel_deps="va_va_h" +h263_vaapi_hwaccel_select="vaapi" h263p_encoder_select="aandct" h264_decoder_select="golomb" h264_vaapi_hwaccel_deps="va_va_h" +h264_vaapi_hwaccel_select="vaapi" h264_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" +h264_vdpau_decoder_select="vdpau" imc_decoder_select="fft mdct" jpegls_decoder_select="golomb" jpegls_encoder_select="golomb" @@ -1046,9 +1053,13 @@ mpeg1video_encoder_select="aandct" mpeg2video_encoder_select="aandct" mpeg4_encoder_select="aandct" mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" +mpeg_vdpau_decoder_select="vdpau" mpeg1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" +mpeg1_vdpau_decoder_select="vdpau" mpeg2_vaapi_hwaccel_deps="va_va_h" +mpeg2_vaapi_hwaccel_select="vaapi" mpeg4_vaapi_hwaccel_deps="va_va_h" +mpeg4_vaapi_hwaccel_select="vaapi" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" msmpeg4v1_encoder_select="aandct" msmpeg4v2_encoder_select="aandct" @@ -1072,7 +1083,9 @@ tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" tscc_decoder_select="zlib" vc1_vaapi_hwaccel_deps="va_va_h" +vc1_vaapi_hwaccel_select="vaapi" vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" +vc1_vdpau_decoder_select="vdpau" vorbis_decoder_select="fft mdct" vorbis_encoder_select="fft mdct" wmav1_decoder_select="fft mdct" @@ -1082,7 +1095,9 @@ wmav2_encoder_select="fft mdct" wmv1_encoder_select="aandct" wmv2_encoder_select="aandct" wmv3_vaapi_hwaccel_deps="va_va_h" +wmv3_vaapi_hwaccel_select="vaapi" wmv3_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" +wmv3_vdpau_decoder_select="vdpau" zlib_decoder_select="zlib" zlib_encoder_select="zlib" zmbv_decoder_select="zlib" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 35bd0112b1..e0d57cf295 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -31,6 +31,8 @@ OBJS-$(CONFIG_FFT) += fft.o OBJS-$(CONFIG_GOLOMB) += golomb.o OBJS-$(CONFIG_MDCT) += mdct.o OBJS-$(CONFIG_RDFT) += rdft.o +OBJS-$(CONFIG_VAAPI) += vaapi.o +OBJS-$(CONFIG_VDPAU) += vdpau.o # decoders/encoders/hardware accelerators OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mpeg4audio.o aac_parser.o aac_ac3_parser.o @@ -98,13 +100,13 @@ OBJS-$(CONFIG_GIF_ENCODER) += gif.o OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o h263_parser.o mpeg12data.o mpegvideo.o error_resilience.o -OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += h263dec.o h263.o h263_parser.o mpeg12data.o mpegvideo.o error_resilience.o vaapi.o vaapi_mpeg4.o +OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += h263dec.o h263.o h263_parser.o mpeg12data.o mpegvideo.o error_resilience.o vaapi_mpeg4.o OBJS-$(CONFIG_H263I_DECODER) += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_H263P_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o -OBJS-$(CONFIG_H264_VDPAU_DECODER) += vdpau.o h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_H264_VDPAU_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o @@ -136,18 +138,18 @@ OBJS-$(CONFIG_MP3ON4_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mp OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o -OBJS-$(CONFIG_MPEG_VDPAU_DECODER) += vdpau.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o -OBJS-$(CONFIG_MPEG1_VDPAU_DECODER) += vdpau.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_MPEG_VDPAU_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o +OBJS-$(CONFIG_MPEG1_VDPAU_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG_XVMC_DECODER) += mpegvideo_xvmc.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o -OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o vaapi.o vaapi_mpeg2.o +OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o vaapi_mpeg2.o OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12data.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG4_DECODER) += h263dec.o h263.o mpeg4video_parser.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MPEG4_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o -OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += h263dec.o h263.o mpeg4video_parser.o mpeg12data.o mpegvideo.o error_resilience.o vaapi.o vaapi_mpeg4.o +OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += h263dec.o h263.o mpeg4video_parser.o mpeg12data.o mpegvideo.o error_resilience.o vaapi_mpeg4.o OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o @@ -235,8 +237,8 @@ OBJS-$(CONFIG_V210_ENCODER) += v210enc.o OBJS-$(CONFIG_V210X_DECODER) += v210x.o OBJS-$(CONFIG_VB_DECODER) += vb.o OBJS-$(CONFIG_VC1_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o -OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi.o vaapi_vc1.o -OBJS-$(CONFIG_VC1_VDPAU_DECODER) += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o +OBJS-$(CONFIG_VC1_VAAPI_HWACCEL) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi_vc1.o +OBJS-$(CONFIG_VC1_VDPAU_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o @@ -260,8 +262,8 @@ OBJS-$(CONFIG_WMV1_ENCODER) += mpegvideo_enc.o motion_est.o ratecontr OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_WMV3_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o -OBJS-$(CONFIG_WMV3_VAAPI_HWACCEL) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi.o vaapi_vc1.o -OBJS-$(CONFIG_WMV3_VDPAU_DECODER) += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o +OBJS-$(CONFIG_WMV3_VAAPI_HWACCEL) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o vaapi_vc1.o +OBJS-$(CONFIG_WMV3_VDPAU_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o