From 89145fbbfecfe9ba1471573ef11fc90e469ae943 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 27 Nov 2012 20:35:27 +0100 Subject: x86: h264dsp: Fix linking with yasm and optimizations disabled Some optimized functions reference optimized symbols, so the functions must be explicitly disabled when those symbols are unavailable. --- libavcodec/x86/h264dsp_init.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/x86/h264dsp_init.c b/libavcodec/x86/h264dsp_init.c index d7257e6fda..ac231cbb08 100644 --- a/libavcodec/x86/h264dsp_init.c +++ b/libavcodec/x86/h264dsp_init.c @@ -129,7 +129,7 @@ LF_IFUNC(v, chroma_intra, depth, avx) LF_FUNCS(uint8_t, 8) LF_FUNCS(uint16_t, 10) -#if ARCH_X86_32 +#if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL LF_FUNC(v8, luma, 8, mmxext) static void ff_deblock_v_luma_8_mmxext(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0) @@ -146,7 +146,7 @@ static void ff_deblock_v_luma_intra_8_mmxext(uint8_t *pix, int stride, ff_deblock_v8_luma_intra_8_mmxext(pix + 0, stride, alpha, beta); ff_deblock_v8_luma_intra_8_mmxext(pix + 8, stride, alpha, beta); } -#endif /* ARCH_X86_32 */ +#endif /* ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL */ LF_FUNC(v, luma, 10, mmxext) LF_IFUNC(v, luma_intra, 10, mmxext) @@ -245,12 +245,12 @@ void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, c->h264_h_loop_filter_chroma = ff_deblock_h_chroma_8_mmxext; c->h264_h_loop_filter_chroma_intra = ff_deblock_h_chroma_intra_8_mmxext; } -#if ARCH_X86_32 +#if ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL c->h264_v_loop_filter_luma = ff_deblock_v_luma_8_mmxext; c->h264_h_loop_filter_luma = ff_deblock_h_luma_8_mmxext; c->h264_v_loop_filter_luma_intra = ff_deblock_v_luma_intra_8_mmxext; c->h264_h_loop_filter_luma_intra = ff_deblock_h_luma_intra_8_mmxext; -#endif /* ARCH_X86_32 */ +#endif /* ARCH_X86_32 && HAVE_MMXEXT_EXTERNAL */ c->weight_h264_pixels_tab[0] = ff_h264_weight_16_mmxext; c->weight_h264_pixels_tab[1] = ff_h264_weight_8_mmxext; c->weight_h264_pixels_tab[2] = ff_h264_weight_4_mmxext; -- cgit v1.2.3 From 9534e0f552a643bfbaa779a21dab4883386a77fd Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 28 Nov 2012 11:44:24 +0100 Subject: fate: lossless-audio: Add dependencies --- tests/fate/lossless-audio.mak | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index f0ff49649e..4808686481 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -1,17 +1,17 @@ -FATE_SAMPLES_AVCONV += fate-lossless-alac +FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ALAC) += fate-lossless-alac fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le -FATE_SAMPLES_AVCONV += fate-lossless-meridianaudio +FATE_SAMPLES_AVCONV-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le -FATE_SAMPLES_AVCONV += fate-lossless-monkeysaudio +FATE_SAMPLES_AVCONV-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le -FATE_SAMPLES_AVCONV += fate-lossless-shorten +FATE_SAMPLES_AVCONV-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le -FATE_SAMPLES_AVCONV += fate-lossless-tta +FATE_SAMPLES_AVCONV-$(call DEMDEC, TTA, TTA) += fate-lossless-tta fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta -FATE_SAMPLES_AVCONV += fate-lossless-wma +FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMALOSSLESS) += fate-lossless-wma fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le -- cgit v1.2.3 From 5116ac7774242a9e3fb661e8f30132b47f7720fd Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 28 Nov 2012 11:44:56 +0100 Subject: fate: real: Add dependencies --- tests/fate/real.mak | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/fate/real.mak b/tests/fate/real.mak index 97160dd5a5..6063cf34e0 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -1,24 +1,24 @@ -FATE_SAMPLES_AVCONV += fate-ra-144 +FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RA_144) += fate-ra-144 fate-ra-144: CMD = md5 -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le -FATE_SAMPLES_AVCONV += fate-ra-288 +FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RA_288) += fate-ra-288 fate-ra-288: CMD = pcm -i $(SAMPLES)/real/ra_288.rm fate-ra-288: CMP = oneoff fate-ra-288: REF = $(SAMPLES)/real/ra_288.pcm fate-ra-288: FUZZ = 2 -FATE_SAMPLES_AVCONV += fate-ra-cook +FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, COOK) += fate-ra-cook fate-ra-cook: CMD = pcm -i $(SAMPLES)/real/ra_cook.rm fate-ra-cook: CMP = oneoff fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm -FATE_SAMPLES_AVCONV += fate-ralf +FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RALF) += fate-ralf fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le -FATE_SAMPLES_AVCONV += fate-rv30 +FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RV30) += fate-rv30 fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an -FATE_SAMPLES_AVCONV += fate-rv40 +FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RV40) += fate-rv40 fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0 FATE_SIPR += fate-sipr-5k0 @@ -39,5 +39,5 @@ fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm $(FATE_SIPR): CMP = oneoff -FATE_SAMPLES_AVCONV += $(FATE_SIPR) +FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, SIPR) += $(FATE_SIPR) fate-sipr: $(FATE_SIPR) -- cgit v1.2.3 From 1f3f896564501c23b44fcf605567c78ce066b539 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 28 Nov 2012 11:45:17 +0100 Subject: fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests --- tests/fate/prores.mak | 2 +- tests/fate/qtrle.mak | 2 +- tests/fate/utvideo.mak | 4 ++-- tests/fate/vorbis.mak | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak index 1d76fff942..9c1a1b1eec 100644 --- a/tests/fate/prores.mak +++ b/tests/fate/prores.mak @@ -4,7 +4,7 @@ FATE_PRORES = fate-prores-422 \ fate-prores-422_proxy \ fate-prores-alpha \ -FATE_SAMPLES_AVCONV += $(FATE_PRORES) +FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES) fate-prores: $(FATE_PRORES) fate-prores-422: CMD = framecrc -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak index 3850a8097b..d8a6ecfb9c 100644 --- a/tests/fate/qtrle.mak +++ b/tests/fate/qtrle.mak @@ -19,5 +19,5 @@ fate-qtrle-24bit: CMD = framecrc -i $(SAMPLES)/qtrle/aletrek-rle.mov FATE_QTRLE += fate-qtrle-32bit fate-qtrle-32bit: CMD = framecrc -i $(SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24 -FATE_SAMPLES_AVCONV += $(FATE_QTRLE) +FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QTRLE) += $(FATE_QTRLE) fate-qtrle: $(FATE_QTRLE) diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak index 7042163d93..004d8e0778 100644 --- a/tests/fate/utvideo.mak +++ b/tests/fate/utvideo.mak @@ -25,7 +25,7 @@ fate-utvideo_yuv422_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_le FATE_UTVIDEO += fate-utvideo_yuv422_median fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_median.avi -FATE_SAMPLES_AVCONV += $(FATE_UTVIDEO) +FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO) fate-utvideo: $(FATE_UTVIDEO) fate-utvideoenc%: CMD = framemd5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -vcodec utvideo -f avi -sws_flags +accurate_rnd+bitexact ${OPTS} @@ -68,5 +68,5 @@ fate-utvideoenc_yuv422_median: OPTS = -pix_fmt yuv422p -pred median $(FATE_UTVIDEOENC): tests/vsynth1/00.pgm -FATE_AVCONV += $(FATE_UTVIDEOENC) +FATE_AVCONV-$(call ENCMUX, UTVIDEO, AVI) += $(FATE_UTVIDEOENC) fate-utvideoenc: $(FATE_UTVIDEOENC) diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak index 774cb350d1..39a97246a9 100644 --- a/tests/fate/vorbis.mak +++ b/tests/fate/vorbis.mak @@ -80,6 +80,6 @@ FATE_VORBIS += fate-vorbis-20 fate-vorbis-20: CMD = pcm -i $(SAMPLES)/vorbis/6.ogg fate-vorbis-20: REF = $(SAMPLES)/vorbis/6.pcm -FATE_SAMPLES_AVCONV += $(FATE_VORBIS) +FATE_SAMPLES_AVCONV-$(call DEMDEC, OGG, VORBIS) += $(FATE_VORBIS) fate-vorbis: $(FATE_VORBIS) $(FATE_VORBIS): CMP = oneoff -- cgit v1.2.3