summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile12
-rw-r--r--avbuild/arch.mak2
-rwxr-xr-xconfigure65
-rw-r--r--libavcodec/x86/Makefile72
-rw-r--r--libavcodec/x86/dcadsp_init.c8
-rw-r--r--libavcodec/x86/fmtconvert_init.c8
-rw-r--r--libavcodec/x86/h264_qpel.c6
-rw-r--r--libavcodec/x86/hpeldsp_init.c4
-rw-r--r--libavcodec/x86/mpegaudiodsp.c8
-rw-r--r--libavcodec/x86/qpeldsp_init.c4
-rw-r--r--libavcodec/x86/rv40dsp_init.c8
-rw-r--r--libavcodec/x86/vc1dsp_init.c8
-rw-r--r--libavcodec/x86/videodsp_init.c8
-rw-r--r--libavcodec/x86/vp8dsp_init.c12
-rw-r--r--libavcodec/x86/vp9dsp_init.c8
-rw-r--r--libavfilter/x86/Makefile10
-rw-r--r--libavfilter/x86/vf_gradfun_init.c8
-rw-r--r--libavfilter/x86/vf_hqdn3d_init.c4
-rw-r--r--libavresample/x86/Makefile6
-rw-r--r--libavutil/x86/Makefile10
-rw-r--r--libavutil/x86/cpu.c4
-rw-r--r--libswscale/x86/Makefile2
-rw-r--r--libswscale/x86/rgb2rgb_template.c4
-rw-r--r--tests/checkasm/Makefile2
-rw-r--r--tests/checkasm/checkasm.h2
25 files changed, 145 insertions, 140 deletions
diff --git a/Makefile b/Makefile
index dc4b0ad..d140ac3 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ vpath %.texi $(SRC_PATH)
ifndef V
Q = @
ECHO = printf "$(1)\t%s\n" $(2)
-BRIEF = CC HOSTCC HOSTLD AS YASM AR LD
-SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM STRIP
+BRIEF = CC HOSTCC HOSTLD AS X86ASM AR LD
+SILENT = DEPCC DEPHOSTCC DEPAS DEPX86ASM RANLIB RM STRIP
MSG = $@
M = @$(call ECHO,$(TAG),$@);
$(foreach VAR,$(BRIEF), \
@@ -30,7 +30,7 @@ CCFLAGS = $(CPPFLAGS) $(CFLAGS)
OBJCFLAGS += $(EOBJCFLAGS)
OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
-YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
+X86ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
@@ -57,8 +57,8 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
$(COMPILE_HOSTC)
%.o: %.asm
- $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
- $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
+ $(DEPX86ASM) $(X86ASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
+ $(X86ASM) $(X86ASMFLAGS) -I $(<D)/ -o $@ $<
-$(STRIP) $(STRIPFLAGS) $@
%.i: %.c
@@ -113,7 +113,7 @@ avbuild/.config: $(CONFIGURABLE_COMPONENTS)
SUBDIR_VARS := CLEANFILES FFLIBS HOSTPROGS TESTPROGS TOOLS \
HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \
- ALTIVEC-OBJS VSX-OBJS MMX-OBJS YASM-OBJS \
+ ALTIVEC-OBJS VSX-OBJS MMX-OBJS X86ASM-OBJS \
OBJS HOSTOBJS TESTOBJS
define RESET
diff --git a/avbuild/arch.mak b/avbuild/arch.mak
index 720062a..a84c1f5 100644
--- a/avbuild/arch.mak
+++ b/avbuild/arch.mak
@@ -8,4 +8,4 @@ OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes)
OBJS-$(HAVE_VSX) += $(VSX-OBJS) $(VSX-OBJS-yes)
OBJS-$(HAVE_MMX) += $(MMX-OBJS) $(MMX-OBJS-yes)
-OBJS-$(HAVE_YASM) += $(YASM-OBJS) $(YASM-OBJS-yes)
+OBJS-$(HAVE_X86ASM) += $(X86ASM-OBJS) $(X86ASM-OBJS-yes)
diff --git a/configure b/configure
index d3921da..969f71d 100755
--- a/configure
+++ b/configure
@@ -325,7 +325,7 @@ Optimization options (experts only):
--disable-vfp disable VFP optimizations
--disable-neon disable NEON optimizations
--disable-inline-asm disable use of inline assembly
- --disable-yasm disable use of nasm/yasm assembly
+ --disable-x86asm disable use of standalone x86 assembly
Developer options (useful when working on Libav itself):
--disable-debug disable debugging symbols
@@ -829,12 +829,12 @@ check_insn(){
echo "$2" | check_as && enable ${1}_external || disable ${1}_external
}
-check_yasm(){
- log check_yasm "$@"
+check_x86asm(){
+ log check_x86asm "$@"
echo "$1" > $TMPS
log_file $TMPS
shift 1
- check_cmd $yasmexe $YASMFLAGS "$@" -o $TMPO $TMPS
+ check_cmd $x86asmexe $X86ASMFLAGS "$@" -o $TMPO $TMPS
}
ld_o(){
@@ -1533,7 +1533,7 @@ BUILTIN_LIST="
HAVE_LIST_CMDLINE="
inline_asm
symver
- yasm
+ x86asm
"
HAVE_LIST_PUB="
@@ -1912,7 +1912,7 @@ fma3_deps="avx"
fma4_deps="avx"
avx2_deps="avx"
-mmx_external_deps="yasm"
+mmx_external_deps="x86asm"
mmx_inline_deps="inline_asm"
mmx_suggest="mmx_external mmx_inline"
@@ -2568,7 +2568,7 @@ pkg_config_default=pkg-config
ranlib="ranlib"
strip="strip"
version_script='--version-script'
-yasmexe="yasm"
+x86asmexe="yasm"
# machine
arch_default=$(uname -m)
@@ -2817,6 +2817,11 @@ for opt do
warn "avserver has been removed, the ${opt} option is only"\
"provided for compatibility and will be removed in the future"
;;
+ --enable-yasm|--disable-yasm)
+ warn "The ${opt} option is only provided for compatibility and will be\n"\
+ "removed in the future. Use --enable-x86asm / --disable-x86asm instead."
+ test $opt = --enable-yasm && x86asm=yes || x86asm=no
+ ;;
--enable-?*|--disable-?*)
eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
if is_in $option $COMPONENT_LIST; then
@@ -4467,30 +4472,30 @@ EOF
enabled ssse3 && check_inline_asm ssse3_inline '"pabsw %xmm0, %xmm0"'
enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
- if ! disabled_any asm mmx yasm; then
- if check_cmd $yasmexe --version; then
- enabled x86_64 && yasm_extra="-m amd64"
- yasm_debug="-g dwarf2"
+ if ! disabled_any asm mmx x86asm; then
+ if check_cmd $x86asmexe --version; then
+ enabled x86_64 && x86asm_extra="-m amd64"
+ x86asm_debug="-g dwarf2"
elif check_cmd nasm -v; then
- yasmexe=nasm
- yasm_debug="-g -F dwarf"
+ x86asmexe=nasm
+ x86asm_debug="-g -F dwarf"
enabled x86_64 && test "$objformat" = elf && objformat=elf64
fi
- YASMFLAGS="-f $objformat $yasm_extra"
- enabled pic && append YASMFLAGS "-DPIC"
- test -n "$extern_prefix" && append YASMFLAGS "-DPREFIX"
+ X86ASMFLAGS="-f $objformat $x86asm_extra"
+ enabled pic && append X86ASMFLAGS "-DPIC"
+ test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX"
case "$objformat" in
- elf*) enabled debug && append YASMFLAGS $yasm_debug ;;
+ elf*) enabled debug && append X86ASMFLAGS $x86asm_debug ;;
esac
- check_yasm "movbe ecx, [5]" && enable yasm ||
- die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build."
- check_yasm "vextracti128 xmm0, ymm0, 0" || disable avx2_external
- check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
- check_yasm "vfmadd132ps ymm0, ymm1, ymm2" || disable fma3_external
- check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
- check_yasm "CPU amdnop" || disable cpunop
+ check_x86asm "movbe ecx, [5]" && enable x86asm ||
+ die "yasm/nasm not found or too old. Use --disable-x86asm for a crippled build."
+ check_x86asm "vextracti128 xmm0, ymm0, 0" || disable avx2_external
+ check_x86asm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
+ check_x86asm "vfmadd132ps ymm0, ymm1, ymm2" || disable fma3_external
+ check_x86asm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
+ check_x86asm "CPU amdnop" || disable cpunop
fi
case "$cpu" in
@@ -5209,7 +5214,7 @@ fi
echo "big-endian ${bigendian-no}"
echo "runtime cpu detection ${runtime_cpudetect-no}"
if enabled x86; then
- echo "${yasmexe} ${yasm-no}"
+ echo "standalone assembly ${x86asm-no}"
echo "MMX enabled ${mmx-no}"
echo "MMXEXT enabled ${mmxext-no}"
echo "3DNow! enabled ${amd3dnow-no}"
@@ -5328,8 +5333,8 @@ DEPCC=$dep_cc
DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS)
DEPAS=$as
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
-YASM=$yasmexe
-DEPYASM=$yasmexe
+X86ASM=$x86asmexe
+DEPX86ASM=$x86asmexe
AR=$ar
ARFLAGS=$arflags
AR_O=$ar_o
@@ -5356,7 +5361,7 @@ LDFLAGS=$LDFLAGS
LDEXEFLAGS=$LDEXEFLAGS
SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
STRIPFLAGS=$STRIPFLAGS
-YASMFLAGS=$YASMFLAGS
+X86ASMFLAGS=$X86ASMFLAGS
LIBPREF=$LIBPREF
LIBSUF=$LIBSUF
LIBNAME=$LIBNAME
@@ -5432,7 +5437,7 @@ EOF
test -n "$malloc_prefix" &&
echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH
-if enabled yasm; then
+if enabled x86asm; then
append config_files $TMPASM
printf '' >$TMPASM
fi
@@ -5451,7 +5456,7 @@ echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH
cp_if_changed $TMPH config.h
touch avbuild/.config
-enabled yasm && cp_if_changed $TMPASM config.asm
+enabled x86asm && cp_if_changed $TMPASM config.asm
cat > $TMPH <<EOF
/* Generated by ffconf */
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 094c1fa..deff63c 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -71,60 +71,60 @@ MMX-OBJS-$(CONFIG_MPEG4_DECODER) += x86/xvididct_mmx.o \
x86/xvididct_sse2.o
# subsystems
-YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o \
+X86ASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o \
x86/ac3dsp_downmix.o
-YASM-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp.o
-YASM-OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp.o
-YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o
-YASM-OBJS-$(CONFIG_FFT) += x86/fft.o
-YASM-OBJS-$(CONFIG_FMTCONVERT) += x86/fmtconvert.o
-YASM-OBJS-$(CONFIG_H263DSP) += x86/h263_loopfilter.o
-YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \
+X86ASM-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp.o
+X86ASM-OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp.o
+X86ASM-OBJS-$(CONFIG_DCT) += x86/dct32.o
+X86ASM-OBJS-$(CONFIG_FFT) += x86/fft.o
+X86ASM-OBJS-$(CONFIG_FMTCONVERT) += x86/fmtconvert.o
+X86ASM-OBJS-$(CONFIG_H263DSP) += x86/h263_loopfilter.o
+X86ASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \
x86/h264_chromamc_10bit.o
-YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \
+X86ASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \
x86/h264_deblock_10bit.o \
x86/h264_idct.o \
x86/h264_idct_10bit.o \
x86/h264_weight.o \
x86/h264_weight_10bit.o
-YASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o \
+X86ASM-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred.o \
x86/h264_intrapred_10bit.o
-YASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_8bit.o \
+X86ASM-OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel_8bit.o \
x86/h264_qpel_10bit.o \
x86/fpel.o \
x86/qpel.o
-YASM-OBJS-$(CONFIG_HPELDSP) += x86/fpel.o \
+X86ASM-OBJS-$(CONFIG_HPELDSP) += x86/fpel.o \
x86/hpeldsp.o
-YASM-OBJS-$(CONFIG_HUFFYUVDSP) += x86/huffyuvdsp.o
-YASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o
-YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o
-YASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o
-YASM-OBJS-$(CONFIG_PIXBLOCKDSP) += x86/pixblockdsp.o
-YASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \
+X86ASM-OBJS-$(CONFIG_HUFFYUVDSP) += x86/huffyuvdsp.o
+X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o
+X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o
+X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o
+X86ASM-OBJS-$(CONFIG_PIXBLOCKDSP) += x86/pixblockdsp.o
+X86ASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \
x86/fpel.o \
x86/qpel.o
-YASM-OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp.o
-YASM-OBJS-$(CONFIG_VC1DSP) += x86/vc1dsp.o
-YASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o
-YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
-YASM-OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp.o \
+X86ASM-OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp.o
+X86ASM-OBJS-$(CONFIG_VC1DSP) += x86/vc1dsp.o
+X86ASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o
+X86ASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
+X86ASM-OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp.o \
x86/vp8dsp_loopfilter.o
# decoders/encoders
-YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
-YASM-OBJS-$(CONFIG_APE_DECODER) += x86/apedsp.o
-YASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o
-YASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o
-YASM-OBJS-$(CONFIG_HEVC_DECODER) += x86/hevc_add_res.o \
+X86ASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
+X86ASM-OBJS-$(CONFIG_APE_DECODER) += x86/apedsp.o
+X86ASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o
+X86ASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o
+X86ASM-OBJS-$(CONFIG_HEVC_DECODER) += x86/hevc_add_res.o \
x86/hevc_deblock.o \
x86/hevc_idct.o \
x86/hevc_mc.o
-YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
-YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
-YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o
-YASM-OBJS-$(CONFIG_V210_ENCODER) += x86/v210enc.o
-YASM-OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp.o
-YASM-OBJS-$(CONFIG_VP3_DECODER) += x86/hpeldsp_vp3.o
-YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp.o
-YASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9mc.o \
+X86ASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
+X86ASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
+X86ASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o
+X86ASM-OBJS-$(CONFIG_V210_ENCODER) += x86/v210enc.o
+X86ASM-OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp.o
+X86ASM-OBJS-$(CONFIG_VP3_DECODER) += x86/hpeldsp_vp3.o
+X86ASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp.o
+X86ASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9mc.o \
x86/vp9lpf.o
diff --git a/libavcodec/x86/dcadsp_init.c b/libavcodec/x86/dcadsp_init.c
index 8632c4a..01a89fe 100644
--- a/libavcodec/x86/dcadsp_init.c
+++ b/libavcodec/x86/dcadsp_init.c
@@ -56,18 +56,18 @@ static void synth_filter_##opt(FFTContext *imdct, \
*synth_buf_offset = (*synth_buf_offset - 32) & 511; \
} \
-#if HAVE_YASM
+#if HAVE_X86ASM
#if ARCH_X86_32
SYNTH_FILTER_FUNC(sse)
#endif
SYNTH_FILTER_FUNC(sse2)
SYNTH_FILTER_FUNC(avx)
SYNTH_FILTER_FUNC(fma3)
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
#if ARCH_X86_32
@@ -84,5 +84,5 @@ av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
if (EXTERNAL_FMA3(cpu_flags) && !(cpu_flags & AV_CPU_FLAG_AVXSLOW)) {
s->synth_filter_float = synth_filter_fma3;
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavcodec/x86/fmtconvert_init.c b/libavcodec/x86/fmtconvert_init.c
index 2f10db4..6306c8b 100644
--- a/libavcodec/x86/fmtconvert_init.c
+++ b/libavcodec/x86/fmtconvert_init.c
@@ -27,16 +27,16 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/fmtconvert.h"
-#if HAVE_YASM
+#if HAVE_X86ASM
void ff_int32_to_float_fmul_scalar_sse (float *dst, const int32_t *src, float mul, int len);
void ff_int32_to_float_fmul_scalar_sse2(float *dst, const int32_t *src, float mul, int len);
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_SSE(cpu_flags)) {
@@ -45,5 +45,5 @@ av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx
if (EXTERNAL_SSE2(cpu_flags)) {
c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2;
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index 7445825..4062e96 100644
--- a/libavcodec/x86/h264_qpel.c
+++ b/libavcodec/x86/h264_qpel.c
@@ -28,7 +28,7 @@
#include "libavcodec/pixels.h"
#include "fpel.h"
-#if HAVE_YASM
+#if HAVE_X86ASM
void ff_put_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,
ptrdiff_t line_size, int h);
void ff_avg_pixels4_mmxext(uint8_t *block, const uint8_t *pixels,
@@ -503,7 +503,7 @@ QPEL16_OP(mc33, MMX)
QPEL16(mmxext)
#endif
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \
do { \
@@ -543,7 +543,7 @@ QPEL16(mmxext)
av_cold void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
int high_bit_depth = bit_depth > 8;
int cpu_flags = av_get_cpu_flags();
diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c
index 6a8d420..d47e788 100644
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -134,7 +134,7 @@ CALL_2X_PIXELS_EXPORT(ff_put_pixels16_xy2_mmx, ff_put_pixels8_xy2_mmx, 8)
#endif /* HAVE_INLINE_ASM */
-#if HAVE_YASM
+#if HAVE_X86ASM
#define HPELDSP_AVG_PIXELS16(CPUEXT) \
CALL_2X_PIXELS(put_no_rnd_pixels16_x2 ## CPUEXT, ff_put_no_rnd_pixels8_x2 ## CPUEXT, 8) \
@@ -148,7 +148,7 @@ CALL_2X_PIXELS_EXPORT(ff_put_pixels16_xy2_mmx, ff_put_pixels8_xy2_mmx, 8)
HPELDSP_AVG_PIXELS16(_3dnow)
HPELDSP_AVG_PIXELS16(_mmxext)
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
#define SET_HPEL_FUNCS(PFX, IDX, SIZE, CPU) \
do { \
diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c
index 591f527..ffdcf1f 100644
--- a/libavcodec/x86/mpegaudiodsp.c
+++ b/libavcodec/x86/mpegaudiodsp.c
@@ -184,7 +184,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out,
#endif /* HAVE_SSE2_INLINE */
-#if HAVE_YASM
+#if HAVE_X86ASM
#define DECL_IMDCT_BLOCKS(CPU1, CPU2) \
static void imdct36_blocks_ ## CPU1(float *out, float *buf, float *in, \
int count, int switch_point, int block_type) \
@@ -222,7 +222,7 @@ DECL_IMDCT_BLOCKS(sse2,sse)
DECL_IMDCT_BLOCKS(sse3,sse)
DECL_IMDCT_BLOCKS(ssse3,sse)
DECL_IMDCT_BLOCKS(avx,avx)
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
{
@@ -248,7 +248,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
}
#endif /* HAVE_SSE2_INLINE */
-#if HAVE_YASM
+#if HAVE_X86ASM
if (EXTERNAL_SSE(cpu_flags)) {
s->imdct36_blocks_float = imdct36_blocks_sse;
}
@@ -264,5 +264,5 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
if (EXTERNAL_AVX(cpu_flags)) {
s->imdct36_blocks_float = imdct36_blocks_avx;
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavcodec/x86/qpeldsp_init.c b/libavcodec/x86/qpeldsp_init.c
index cdefe50..e280c82 100644
--- a/libavcodec/x86/qpeldsp_init.c
+++ b/libavcodec/x86/qpeldsp_init.c
@@ -80,7 +80,7 @@ void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst,
#define ff_put_no_rnd_pixels16_mmxext ff_put_pixels16_mmxext
#define ff_put_no_rnd_pixels8_mmxext ff_put_pixels8_mmxext
-#if HAVE_YASM
+#if HAVE_X86ASM
CALL_2X_PIXELS(ff_avg_pixels16_mmxext, ff_avg_pixels8_mmxext, 8)
CALL_2X_PIXELS(ff_put_pixels16_mmxext, ff_put_pixels8_mmxext, 8)
@@ -502,7 +502,7 @@ QPEL_OP(put_, _, mmxext)
QPEL_OP(avg_, _, mmxext)
QPEL_OP(put_no_rnd_, _no_rnd_, mmxext)
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \
do { \
diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c
index f6d4165..5ba0aa5 100644
--- a/libavcodec/x86/rv40dsp_init.c
+++ b/libavcodec/x86/rv40dsp_init.c
@@ -32,7 +32,7 @@
#include "libavutil/x86/cpu.h"
#include "hpeldsp.h"
-#if HAVE_YASM
+#if HAVE_X86ASM
void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src,
ptrdiff_t stride, int h, int x, int y);
void ff_avg_rv40_chroma_mc8_mmxext(uint8_t *dst, uint8_t *src,
@@ -186,7 +186,7 @@ QPEL_FUNCS_SET (OP, 3, 1, OPT) \
QPEL_FUNCS_SET (OP, 3, 2, OPT)
/** @} */
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
#if HAVE_MMX_INLINE
static void put_rv40_qpel8_mc33_mmx(uint8_t *dst, const uint8_t *src,
@@ -224,7 +224,7 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c)
}
#endif /* HAVE_MMX_INLINE */
-#if HAVE_YASM
+#if HAVE_X86ASM
if (EXTERNAL_MMX(cpu_flags)) {
c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx;
c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx;
@@ -266,5 +266,5 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c)
QPEL_MC_SET(put_, _ssse3)
QPEL_MC_SET(avg_, _ssse3)
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavcodec/x86/vc1dsp_init.c b/libavcodec/x86/vc1dsp_init.c
index 8982ff9..46bb906 100644
--- a/libavcodec/x86/vc1dsp_init.c
+++ b/libavcodec/x86/vc1dsp_init.c
@@ -50,7 +50,7 @@ static void vc1_h_loop_filter16_ ## EXT(uint8_t *src, int stride, int pq) \
ff_vc1_h_loop_filter8_ ## EXT(src+8*stride, stride, pq); \
}
-#if HAVE_YASM
+#if HAVE_X86ASM
LOOP_FILTER(mmxext)
LOOP_FILTER(sse2)
LOOP_FILTER(ssse3)
@@ -68,7 +68,7 @@ static void avg_vc1_mspel_mc00_mmxext(uint8_t *dst, const uint8_t *src,
{
ff_avg_pixels8_mmxext(dst, src, stride, 8);
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
void ff_put_vc1_chroma_mc8_nornd_mmx (uint8_t *dst, uint8_t *src,
ptrdiff_t stride, int h, int x, int y);
@@ -100,7 +100,7 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp)
dsp->vc1_v_loop_filter16 = vc1_v_loop_filter16_ ## EXT; \
dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_ ## EXT
-#if HAVE_YASM
+#if HAVE_X86ASM
if (EXTERNAL_MMX(cpu_flags)) {
dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_nornd_mmx;
}
@@ -128,5 +128,5 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp)
dsp->vc1_h_loop_filter8 = ff_vc1_h_loop_filter8_sse4;
dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_sse4;
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavcodec/x86/videodsp_init.c b/libavcodec/x86/videodsp_init.c
index d5bfe01..e7f24a9 100644
--- a/libavcodec/x86/videodsp_init.c
+++ b/libavcodec/x86/videodsp_init.c
@@ -27,7 +27,7 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/videodsp.h"
-#if HAVE_YASM
+#if HAVE_X86ASM
typedef void emu_edge_vfix_func(uint8_t *dst, const uint8_t *src,
x86_reg dst_stride, x86_reg src_stride,
x86_reg start_y, x86_reg end_y, x86_reg bh);
@@ -235,14 +235,14 @@ static av_noinline void emulated_edge_mc_sse2(uint8_t *buf, const uint8_t *src,
src_y, w, h, vfixtbl_sse, &ff_emu_edge_vvar_sse,
hfixtbl_sse2, &ff_emu_edge_hvar_sse2);
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
void ff_prefetch_mmxext(uint8_t *buf, ptrdiff_t stride, int h);
void ff_prefetch_3dnow(uint8_t *buf, ptrdiff_t stride, int h);
av_cold void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
#if ARCH_X86_32
@@ -264,5 +264,5 @@ av_cold void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc)
if (EXTERNAL_SSE2(cpu_flags) && bpc <= 8) {
ctx->emulated_edge_mc = emulated_edge_mc_sse2;
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavcodec/x86/vp8dsp_init.c b/libavcodec/x86/vp8dsp_init.c
index 3e84bed..8702c59 100644
--- a/libavcodec/x86/vp8dsp_init.c
+++ b/libavcodec/x86/vp8dsp_init.c
@@ -26,7 +26,7 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/vp8dsp.h"
-#if HAVE_YASM
+#if HAVE_X86ASM
/*
* MC functions
@@ -288,7 +288,7 @@ DECLARE_LOOP_FILTER(sse2)
DECLARE_LOOP_FILTER(ssse3)
DECLARE_LOOP_FILTER(sse4)
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
#define VP8_LUMA_MC_FUNC(IDX, SIZE, OPT) \
c->put_vp8_epel_pixels_tab[IDX][0][2] = ff_put_vp8_epel ## SIZE ## _h6_ ## OPT; \
@@ -316,7 +316,7 @@ DECLARE_LOOP_FILTER(sse4)
av_cold void ff_vp78dsp_init_x86(VP8DSPContext *c)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMX(cpu_flags)) {
@@ -361,12 +361,12 @@ av_cold void ff_vp78dsp_init_x86(VP8DSPContext *c)
VP8_BILINEAR_MC_FUNC(1, 8, ssse3);
VP8_BILINEAR_MC_FUNC(2, 4, ssse3);
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
av_cold void ff_vp8dsp_init_x86(VP8DSPContext *c)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMX(cpu_flags)) {
@@ -460,5 +460,5 @@ av_cold void ff_vp8dsp_init_x86(VP8DSPContext *c)
c->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16y_mbedge_sse4;
c->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_mbedge_sse4;
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavcodec/x86/vp9dsp_init.c b/libavcodec/x86/vp9dsp_init.c
index 59cde79..fbd68db 100644
--- a/libavcodec/x86/vp9dsp_init.c
+++ b/libavcodec/x86/vp9dsp_init.c
@@ -27,7 +27,7 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/vp9.h"
-#if HAVE_YASM
+#if HAVE_X86ASM
#define fpel_func(avg, sz, opt) \
void ff_vp9_ ## avg ## sz ## _ ## opt(uint8_t *dst, ptrdiff_t dst_stride, \
@@ -241,11 +241,11 @@ lpf_funcs(88, 16, avx);
#undef lpf_funcs
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
#define init_fpel(idx1, idx2, sz, type, opt) \
@@ -345,5 +345,5 @@ av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp)
#undef init_subpel2
#undef init_subpel3
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavfilter/x86/Makefile b/libavfilter/x86/Makefile
index 13b5d31..6b27ddc 100644
--- a/libavfilter/x86/Makefile
+++ b/libavfilter/x86/Makefile
@@ -4,8 +4,8 @@ OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace_init.o
OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume_init.o
OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif_init.o
-YASM-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o
-YASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d.o
-YASM-OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace.o
-YASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o
-YASM-OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif.o
+X86ASM-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o
+X86ASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d.o
+X86ASM-OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace.o
+X86ASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o
+X86ASM-OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif.o
diff --git a/libavfilter/x86/vf_gradfun_init.c b/libavfilter/x86/vf_gradfun_init.c
index f8d85c7..0f074d7 100644
--- a/libavfilter/x86/vf_gradfun_init.c
+++ b/libavfilter/x86/vf_gradfun_init.c
@@ -40,7 +40,7 @@ void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf,
uint16_t *buf1, uint16_t *dc,
uint8_t *src1, uint8_t *src2);
-#if HAVE_YASM
+#if HAVE_X86ASM
static void gradfun_filter_line(uint8_t *dst, uint8_t *src, uint16_t *dc,
int width, int thresh, const uint16_t *dithers,
int alignment)
@@ -84,11 +84,11 @@ static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t *buf1,
dc + width, src + width * 2,
src + width * 2 + src_linesize);
}
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
av_cold void ff_gradfun_init_x86(GradFunContext *gf)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMXEXT(cpu_flags))
@@ -98,5 +98,5 @@ av_cold void ff_gradfun_init_x86(GradFunContext *gf)
if (EXTERNAL_SSE2(cpu_flags))
gf->blur_line = gradfun_blur_line_sse2;
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavfilter/x86/vf_hqdn3d_init.c b/libavfilter/x86/vf_hqdn3d_init.c
index 06f9e00..5a01a58 100644
--- a/libavfilter/x86/vf_hqdn3d_init.c
+++ b/libavfilter/x86/vf_hqdn3d_init.c
@@ -38,10 +38,10 @@ void ff_hqdn3d_row_16_x86(uint8_t *src, uint8_t *dst, uint16_t *line_ant,
av_cold void ff_hqdn3d_init_x86(HQDN3DContext *hqdn3d)
{
-#if HAVE_YASM
+#if HAVE_X86ASM
hqdn3d->denoise_row[8] = ff_hqdn3d_row_8_x86;
hqdn3d->denoise_row[9] = ff_hqdn3d_row_9_x86;
hqdn3d->denoise_row[10] = ff_hqdn3d_row_10_x86;
hqdn3d->denoise_row[16] = ff_hqdn3d_row_16_x86;
-#endif /* HAVE_YASM */
+#endif /* HAVE_X86ASM */
}
diff --git a/libavresample/x86/Makefile b/libavresample/x86/Makefile
index 0ca2d79..2faf87f 100644
--- a/libavresample/x86/Makefile
+++ b/libavresample/x86/Makefile
@@ -4,6 +4,6 @@ OBJS += x86/audio_convert_init.o \
OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
-YASM-OBJS += x86/audio_convert.o \
- x86/audio_mix.o \
- x86/dither.o \
+X86ASM-OBJS += x86/audio_convert.o \
+ x86/audio_mix.o \
+ x86/dither.o \
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile
index ffee43b..b619478 100644
--- a/libavutil/x86/Makefile
+++ b/libavutil/x86/Makefile
@@ -3,8 +3,8 @@ OBJS += x86/cpu.o \
x86/imgutils_init.o \
x86/lls_init.o \
-YASM-OBJS += x86/cpuid.o \
- x86/emms.o \
- x86/float_dsp.o \
- x86/imgutils.o \
- x86/lls.o \
+X86ASM-OBJS += x86/cpuid.o \
+ x86/emms.o \
+ x86/float_dsp.o \
+ x86/imgutils.o \
+ x86/lls.o \
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index 3b085e7..7c50fe3 100644
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -28,7 +28,7 @@
#include "libavutil/cpu.h"
#include "libavutil/cpu_internal.h"
-#if HAVE_YASM
+#if HAVE_X86ASM
#define cpuid(index, eax, ebx, ecx, edx) \
ff_cpu_cpuid(index, &eax, &ebx, &ecx, &edx)
@@ -66,7 +66,7 @@
#define cpuid_test() 1
-#elif HAVE_YASM
+#elif HAVE_X86ASM
#define cpuid_test ff_cpu_cpuid_test
diff --git a/libswscale/x86/Makefile b/libswscale/x86/Makefile
index b94b14a..642ce56 100644
--- a/libswscale/x86/Makefile
+++ b/libswscale/x86/Makefile
@@ -4,6 +4,6 @@ OBJS += x86/rgb2rgb.o \
OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
-YASM-OBJS += x86/input.o \
+X86ASM-OBJS += x86/input.o \
x86/output.o \
x86/scale.o \
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c
index 3b9c82b..5b8ba12 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -1945,7 +1945,7 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui
}
#endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */
-#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM
+#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_X86ASM
void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV,
const uint8_t *src, const uint8_t *unused, int w,
uint32_t *unused2);
@@ -2538,7 +2538,7 @@ static av_cold void RENAME(rgb2rgb_init)(void)
#if !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX
interleaveBytes = RENAME(interleaveBytes);
#endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */
-#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_YASM
+#if !COMPILE_TEMPLATE_AMD3DNOW && (ARCH_X86_32 || COMPILE_TEMPLATE_SSE2) && COMPILE_TEMPLATE_MMXEXT == COMPILE_TEMPLATE_SSE2 && HAVE_X86ASM
deinterleaveBytes = RENAME(deinterleaveBytes);
#endif
}
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index 87f92f4..d5febec 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -21,7 +21,7 @@ CHECKASMOBJS-$(CONFIG_AVCODEC) += $(AVCODECOBJS-yes)
CHECKASMOBJS-$(ARCH_AARCH64) += aarch64/checkasm.o
CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o
-CHECKASMOBJS-$(HAVE_YASM) += x86/checkasm.o
+CHECKASMOBJS-$(HAVE_X86ASM) += x86/checkasm.o
CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o
CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index 462c908..db71382 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -89,7 +89,7 @@ static av_unused void *func_ref, *func_new;
/* Call the reference function */
#define call_ref(...) ((func_type *)func_ref)(__VA_ARGS__)
-#if ARCH_X86 && HAVE_YASM
+#if ARCH_X86 && HAVE_X86ASM
/* Verifies that clobbered callee-saved registers are properly saved and restored
* and that either no MMX registers are touched or emms is issued */
void checkasm_checked_call(void *func, ...);
OpenPOWER on IntegriCloud