diff --git a/configure b/configure index a0e6b47d9d..76279a26e1 100755 --- a/configure +++ b/configure @@ -1691,6 +1691,7 @@ log2_deps="!msvcrt" dct_select="rdft" error_resilience_select="dsputil" frame_thread_encoder_deps="encoders threads" +lpc_select="dsputil" mdct_select="fft" rdft_select="fft" mpegaudio_select="mpegaudiodsp" @@ -1709,9 +1710,13 @@ alac_encoder_select="lpc" als_decoder_select="dsputil" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" +amv_decoder_select="dsputil" amv_encoder_select="aandcttables" ape_decoder_select="dsputil" -asv_decoder_select="dsputil" +asv1_decoder_select="dsputil" +asv1_encoder_select="dsputil" +asv2_decoder_select="dsputil" +asv2_encoder_select="dsputil" atrac1_decoder_select="mdct sinewin" atrac3_decoder_select="mdct" bink_decoder_select="dsputil hpeldsp" @@ -1728,6 +1733,7 @@ dirac_decoder_select="dsputil dwt golomb videodsp" dnxhd_decoder_select="dsputil" dnxhd_encoder_select="aandcttables dsputil mpegvideoenc" dvvideo_decoder_select="dsputil" +dvvideo_encoder_select="dsputil" dxa_decoder_select="zlib" eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" @@ -1736,8 +1742,9 @@ eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables error_resilience mpegvideo" exr_decoder_select="zlib" ffv1_decoder_select="dsputil golomb rangecoder" -ffv1_encoder_select="rangecoder" -ffvhuff_encoder_select="huffman" +ffv1_encoder_select="dsputil rangecoder" +ffvhuff_decoder_select="dsputil" +ffvhuff_encoder_select="dsputil huffman" flac_decoder_select="golomb" flac_encoder_select="dsputil golomb lpc" flashsv_decoder_select="zlib" @@ -1758,12 +1765,12 @@ h263p_encoder_select="h263_encoder" h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp" h264_decoder_suggest="error_resilience" huffyuv_decoder_select="dsputil" -huffyuv_encoder_select="huffman" -iac_decoder_select="fft mdct sinewin" +huffyuv_encoder_select="dsputil huffman" +iac_decoder_select="dsputil fft mdct sinewin" imc_decoder_select="dsputil fft mdct sinewin" indeo3_decoder_select="hpeldsp" interplay_video_decoder_select="hpeldsp" -jpegls_decoder_select="golomb" +jpegls_decoder_select="dsputil golomb" jpegls_encoder_select="golomb" jv_decoder_select="dsputil" lagarith_decoder_select="dsputil" @@ -1772,6 +1779,7 @@ loco_decoder_select="golomb" mdec_decoder_select="dsputil error_resilience mpegvideo" mimic_decoder_select="dsputil hpeldsp" mjpeg_decoder_select="dsputil hpeldsp" +mjpegb_decoder_select="dsputil hpeldsp" mjpeg_encoder_select="aandcttables dsputil mpegvideoenc" mlp_decoder_select="dsputil mlp_parser" motionpixels_decoder_select="dsputil" @@ -1801,12 +1809,14 @@ msmpeg4v2_encoder_select="h263_encoder" msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_encoder_select="h263_encoder" mss2_decoder_select="error_resilience vc1_decoder" +mxpeg_decoder_select="dsputil" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" nuv_decoder_select="dsputil lzo" png_decoder_select="zlib" png_encoder_select="dsputil zlib" prores_decoder_select="dsputil" +prores_encoder_select="dsputil" qcelp_decoder_select="lsp" qdm2_decoder_select="mdct rdft mpegaudiodsp" ra_144_encoder_select="audio_frame_queue lpc" @@ -1825,20 +1835,23 @@ snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rang sonic_decoder_select="golomb" sonic_encoder_select="golomb" sonic_ls_encoder_select="golomb" +sp5x_decoder_select="dsputil" svq1_decoder_select="hpeldsp" svq1_encoder_select="aandcttables dsputil hpeldsp mpegvideoenc" -svq3_decoder_select="dsputil golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp" +svq3_decoder_select="golomb h264chroma h264dsp h264pred h264qpel mpegvideo videodsp" svq3_decoder_suggest="error_resilience zlib" tak_decoder_select="dsputil" theora_decoder_select="vp3_decoder" tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" +thp_decoder_select="dsputil" truehd_decoder_select="mlp_parser" truemotion2_decoder_select="dsputil" +truespeech_decoder_select="dsputil" tscc_decoder_select="zlib" twinvq_decoder_select="mdct lsp sinewin" utvideo_decoder_select="dsputil" -utvideo_encoder_select="huffman" +utvideo_encoder_select="dsputil huffman" vble_decoder_select="dsputil" vc1_decoder_select="error_resilience h263_decoder h264chroma h264qpel" vc1image_decoder_select="vc1_decoder" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fcb006a1db..f65e0e9e45 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -38,9 +38,8 @@ OBJS-$(CONFIG_AUDIO_FRAME_QUEUE) += audio_frame_queue.o OBJS-$(CONFIG_CRYSTALHD) += crystalhd.o OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o OBJS-$(CONFIG_DXVA2) += dxva2.o -OBJS-$(CONFIG_DSPUTIL) += dsputil.o faanidct.o \ - simple_idct.o \ - jrevdct.o +OBJS-$(CONFIG_DSPUTIL) += dsputil.o faanidct.o \ + simple_idct.o jrevdct.o OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index e1573c0161..295e399214 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -1,5 +1,5 @@ -OBJS += x86/fmtconvert_init.o \ - x86/constants.o +OBJS += x86/constants.o \ + x86/fmtconvert_init.o \ OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o @@ -52,6 +52,10 @@ YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\ x86/dwt_yasm.o +YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o \ + x86/fpelbase.o \ + x86/mpeg4qpel.o \ + x86/qpelbase.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_H263_DECODER) += x86/h263_loopfilter.o @@ -88,10 +92,5 @@ YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp.o YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o YASM-OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp.o -YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o \ - x86/mpeg4qpel.o \ - x86/qpelbase.o \ - x86/fpelbase.o - YASM-OBJS += x86/deinterlace.o \ - x86/fmtconvert.o + x86/fmtconvert.o \ diff --git a/libavcodec/x86/constants.c b/libavcodec/x86/constants.c index 821d73f4ed..7c2ddc6067 100644 --- a/libavcodec/x86/constants.c +++ b/libavcodec/x86/constants.c @@ -21,6 +21,9 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" // for xmm_reg +DECLARE_ALIGNED(8, const uint64_t, ff_bone) = 0x0101010101010101ULL; +DECLARE_ALIGNED(8, const uint64_t, ff_wtwo) = 0x0002000200020002ULL; + DECLARE_ALIGNED(16, const xmm_reg, ff_pw_1) = { 0x0001000100010001ULL, 0x0001000100010001ULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_2) = { 0x0002000200020002ULL, 0x0002000200020002ULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_3) = { 0x0003000300030003ULL, 0x0003000300030003ULL }; diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index fe59d22017..58429c4e66 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -38,9 +38,6 @@ //#include /* pixel operations */ -DECLARE_ALIGNED(8, const uint64_t, ff_bone) = 0x0101010101010101ULL; -DECLARE_ALIGNED(8, const uint64_t, ff_wtwo) = 0x0002000200020002ULL; - DECLARE_ALIGNED(8, const uint64_t, ff_pw_15) = 0x000F000F000F000FULL; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_17) = { 0x0011001100110011ULL, 0x0011001100110011ULL }; DECLARE_ALIGNED(8, const uint64_t, ff_pw_20) = 0x0014001400140014ULL;