virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

build: Generalize yasm/nasm-related variable names

Browse Source 
None of them are specific to the YASM assembler.

(Cherry-picked from libav commit 39e208f4d4)

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Diego Biurrun 2016-10-08 14:18:33 +00:00 committed by James Almer
parent 664ac7c5e2
commit fd502f4f5f
49 changed files with 246 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -99,7 +99,7 @@ ffbuild/.config: $(CONFIGURABLE_COMPONENTS)
SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \
HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \
ARMV5TE-OBJS ARMV6-OBJS ARMV8-OBJS VFP-OBJS NEON-OBJS \ 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 \
MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \ MIPSFPU-OBJS MIPSDSPR2-OBJS MIPSDSP-OBJS MSA-OBJS \
MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS MMI-OBJS OBJS SLIBOBJS HOSTOBJS TESTOBJS

74
configure vendored
View File

@ -330,7 +330,7 @@ Toolchain options:
--ln_s=LN_S use symbolic link tool LN_S [$ln_s_default] --ln_s=LN_S use symbolic link tool LN_S [$ln_s_default]
--strip=STRIP use strip tool STRIP [$strip_default] --strip=STRIP use strip tool STRIP [$strip_default]
--windres=WINDRES use windows resource compiler WINDRES [$windres_default] --windres=WINDRES use windows resource compiler WINDRES [$windres_default]
--yasmexe=EXE use yasm-compatible assembler EXE [$yasmexe_default] --x86asmexe=EXE use nasm-compatible assembler EXE [$x86asmexe_default]
--cc=CC use C compiler CC [$cc_default] --cc=CC use C compiler CC [$cc_default]
--cxx=CXX use C compiler CXX [$cxx_default] --cxx=CXX use C compiler CXX [$cxx_default]
--objcc=OCC use ObjC compiler OCC [$cc_default] --objcc=OCC use ObjC compiler OCC [$cc_default]
@ -401,7 +401,7 @@ Optimization options (experts only):
--disable-vfp disable VFP optimizations --disable-vfp disable VFP optimizations
--disable-neon disable NEON optimizations --disable-neon disable NEON optimizations
--disable-inline-asm disable use of inline assembly --disable-inline-asm disable use of inline assembly
--disable-yasm disable use of nasm/yasm assembly --disable-x86asm disable use of standalone x86 assembly
--disable-mipsdsp disable MIPS DSP ASE R1 optimizations --disable-mipsdsp disable MIPS DSP ASE R1 optimizations
--disable-mipsdspr2 disable MIPS DSP ASE R2 optimizations --disable-mipsdspr2 disable MIPS DSP ASE R2 optimizations
--disable-msa disable MSA optimizations --disable-msa disable MSA optimizations
@ -979,12 +979,12 @@ check_insn(){
echo "$2" | check_as && enable ${1}_external || disable ${1}_external echo "$2" | check_as && enable ${1}_external || disable ${1}_external
} }
check_yasm(){ check_x86asm(){
log check_yasm "$@" log check_x86asm "$@"
echo "$1" > $TMPS echo "$1" > $TMPS
log_file $TMPS log_file $TMPS
shift 1 shift 1
check_cmd $yasmexe $YASMFLAGS -Werror "$@" -o $TMPO $TMPS check_cmd $x86asmexe $X86ASMFLAGS -Werror "$@" -o $TMPO $TMPS
} }
ld_o(){ ld_o(){
@ -1833,7 +1833,7 @@ BUILTIN_LIST="
HAVE_LIST_CMDLINE=" HAVE_LIST_CMDLINE="
inline_asm inline_asm
symver symver
yasm x86asm
" "
HAVE_LIST_PUB=" HAVE_LIST_PUB="
@ -2237,7 +2237,7 @@ CMDLINE_SET="
tempprefix tempprefix
toolchain toolchain
valgrind valgrind
yasmexe x86asmexe
" "
CMDLINE_APPEND=" CMDLINE_APPEND="
@ -2305,7 +2305,7 @@ fma3_deps="avx"
fma4_deps="avx" fma4_deps="avx"
avx2_deps="avx" avx2_deps="avx"
mmx_external_deps="yasm" mmx_external_deps="x86asm"
mmx_inline_deps="inline_asm" mmx_inline_deps="inline_asm"
mmx_suggest="mmx_external mmx_inline" mmx_suggest="mmx_external mmx_inline"
@ -3259,7 +3259,7 @@ pkg_config_default=pkg-config
ranlib_default="ranlib" ranlib_default="ranlib"
strip_default="strip" strip_default="strip"
version_script='--version-script' version_script='--version-script'
yasmexe_default="yasm" x86asmexe_default="yasm"
windres_default="windres" windres_default="windres"
nvcc_default="nvcc" nvcc_default="nvcc"
nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2" nvccflags_default="-gencode arch=compute_30,code=sm_30 -O2"
@ -3508,6 +3508,16 @@ for opt do
[ "$list" = "" ] && warn "Option $opt did not match anything" [ "$list" = "" ] && warn "Option $opt did not match anything"
$action $list $action $list
;; ;;
--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
;;
--yasmexe=*)
warn "The --yasmexe option is only provided for compatibility and will be\n"\
"removed in the future. Use --x86asmexe instead."
x86asmexe="$optval"
;;
--enable-?*|--disable-?*) --enable-?*|--disable-?*)
eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g') eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
if is_in $option $COMPONENT_LIST; then if is_in $option $COMPONENT_LIST; then
@ -3726,7 +3736,7 @@ windres_default="${cross_prefix}${windres_default}"
sysinclude_default="${sysroot}/usr/include" sysinclude_default="${sysroot}/usr/include"
set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \ set_default arch cc cxx doxygen pkg_config ranlib strip sysinclude \
target_exec target_os yasmexe nvcc target_exec target_os x86asmexe nvcc
enabled cross_compile || host_cc_default=$cc enabled cross_compile || host_cc_default=$cc
set_default host_cc set_default host_cc
@ -5477,13 +5487,13 @@ EOF
enabled ssse3 && check_inline_asm ssse3_inline '"pabsw %xmm0, %xmm0"' enabled ssse3 && check_inline_asm ssse3_inline '"pabsw %xmm0, %xmm0"'
enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"' enabled mmxext && check_inline_asm mmxext_inline '"pmaxub %mm0, %mm1"'
if ! disabled_any asm mmx yasm; then if ! disabled_any asm mmx x86asm; then
if check_cmd $yasmexe --version; then if check_cmd $x86asmexe --version; then
enabled x86_64 && yasm_extra="-m amd64" enabled x86_64 && x86asm_extra="-m amd64"
yasm_debug="-g dwarf2" x86asm_debug="-g dwarf2"
elif check_cmd nasm -v; then elif check_cmd nasm -v; then
yasmexe=nasm x86asmexe=nasm
yasm_debug="-g -F dwarf" x86asm_debug="-g -F dwarf"
if enabled x86_64; then if enabled x86_64; then
case "$objformat" in case "$objformat" in
elf) objformat=elf64 ;; elf) objformat=elf64 ;;
@ -5492,19 +5502,19 @@ EOF
fi fi
fi fi
YASMFLAGS="-f $objformat $yasm_extra" X86ASMFLAGS="-f $objformat $x86asm_extra"
enabled pic && append YASMFLAGS "-DPIC" enabled pic && append X86ASMFLAGS "-DPIC"
test -n "$extern_prefix" && append YASMFLAGS "-DPREFIX" test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX"
case "$objformat" in case "$objformat" in
elf*) enabled debug && append YASMFLAGS $yasm_debug ;; elf*) enabled debug && append X86ASMFLAGS $x86asm_debug ;;
esac esac
check_yasm "movbe ecx, [5]" && enable yasm || check_x86asm "movbe ecx, [5]" && enable x86asm ||
die "yasm/nasm not found or too old. Use --disable-yasm for a crippled build." die "yasm/nasm not found or too old. Use --disable-x86asm for a crippled build."
check_yasm "vextracti128 xmm0, ymm0, 0" || disable avx2_external check_x86asm "vextracti128 xmm0, ymm0, 0" || disable avx2_external
check_yasm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external check_x86asm "vpmacsdd xmm0, xmm1, xmm2, xmm3" || disable xop_external
check_yasm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external check_x86asm "vfmaddps ymm0, ymm1, ymm2, ymm3" || disable fma4_external
check_yasm "CPU amdnop" || disable cpunop check_x86asm "CPU amdnop" || disable cpunop
fi fi
case "$cpu" in case "$cpu" in
@ -6591,7 +6601,7 @@ fi
echo "big-endian ${bigendian-no}" echo "big-endian ${bigendian-no}"
echo "runtime cpu detection ${runtime_cpudetect-no}" echo "runtime cpu detection ${runtime_cpudetect-no}"
if enabled x86; then if enabled x86; then
echo "${yasmexe} ${yasm-no}" echo "standalone assembly ${x86asm-no}"
echo "MMX enabled ${mmx-no}" echo "MMX enabled ${mmx-no}"
echo "MMXEXT enabled ${mmxext-no}" echo "MMXEXT enabled ${mmxext-no}"
echo "3DNow! enabled ${amd3dnow-no}" echo "3DNow! enabled ${amd3dnow-no}"
@ -6727,8 +6737,8 @@ DEPCC=$dep_cc
DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS) DEPCCFLAGS=$DEPCCFLAGS \$(CPPFLAGS)
DEPAS=$as DEPAS=$as
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS) DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
YASM=$yasmexe X86ASM=$x86asmexe
DEPYASM=$yasmexe DEPX86ASM=$x86asmexe
AR=$ar AR=$ar
ARFLAGS=$arflags ARFLAGS=$arflags
AR_O=$ar_o AR_O=$ar_o
@ -6767,7 +6777,7 @@ LDEXEFLAGS=$LDEXEFLAGS
LDLIBFLAGS=$LDLIBFLAGS LDLIBFLAGS=$LDLIBFLAGS
SHFLAGS=$(echo $($ldflags_filter $SHFLAGS)) SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
ASMSTRIPFLAGS=$ASMSTRIPFLAGS ASMSTRIPFLAGS=$ASMSTRIPFLAGS
YASMFLAGS=$YASMFLAGS X86ASMFLAGS=$X86ASMFLAGS
BUILDSUF=$build_suffix BUILDSUF=$build_suffix
PROGSSUF=$progs_suffix PROGSSUF=$progs_suffix
FULLNAME=$FULLNAME FULLNAME=$FULLNAME
@ -6861,7 +6871,7 @@ test -n "$assert_level" &&
test -n "$malloc_prefix" && test -n "$malloc_prefix" &&
echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH echo "#define MALLOC_PREFIX $malloc_prefix" >>$TMPH
if enabled yasm; then if enabled x86asm; then
append config_files $TMPASM append config_files $TMPASM
printf '' >$TMPASM printf '' >$TMPASM
fi fi
@ -6887,7 +6897,7 @@ echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak
cp_if_changed $TMPH config.h cp_if_changed $TMPH config.h
touch ffbuild/.config touch ffbuild/.config
enabled yasm && cp_if_changed $TMPASM config.asm enabled x86asm && cp_if_changed $TMPASM config.asm
cat > $TMPH <<EOF cat > $TMPH <<EOF
/* Generated by ffconf */ /* Generated by ffconf */

2
ffbuild/arch.mak
View File

@ -14,4 +14,4 @@ OBJS-$(HAVE_ALTIVEC) += $(ALTIVEC-OBJS) $(ALTIVEC-OBJS-yes)
OBJS-$(HAVE_VSX) += $(VSX-OBJS) $(VSX-OBJS-yes) OBJS-$(HAVE_VSX) += $(VSX-OBJS) $(VSX-OBJS-yes)
OBJS-$(HAVE_MMX) += $(MMX-OBJS) $(MMX-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)

26
ffbuild/common.mak
View File

@ -2,12 +2,12 @@
# common bits used by all libraries # common bits used by all libraries
# #
DEFAULT_YASMD=.dbg DEFAULT_X86ASMD=.dbg
ifeq ($(DBG),1) ifeq ($(DBG),1)
YASMD=$(DEFAULT_YASMD) X86ASMD=$(DEFAULT_X86ASMD)
else else
YASMD= X86ASMD=
endif endif
ifndef SUBDIR ifndef SUBDIR
@ -15,8 +15,8 @@ ifndef SUBDIR
ifndef V ifndef V
Q = @ Q = @
ECHO = printf "$(1)\t%s\n" $(2) ECHO = printf "$(1)\t%s\n" $(2)
BRIEF = CC CXX OBJCC HOSTCC HOSTLD AS YASM AR LD STRIP CP WINDRES NVCC BRIEF = CC CXX OBJCC HOSTCC HOSTLD AS X86ASM AR LD STRIP CP WINDRES NVCC
SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM SILENT = DEPCC DEPHOSTCC DEPAS DEPX86ASM RANLIB RM
MSG = $@ MSG = $@
M = @$(call ECHO,$(TAG),$@); M = @$(call ECHO,$(TAG),$@);
@ -37,7 +37,7 @@ OBJCFLAGS += $(EOBJCFLAGS)
OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS) OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
CXXFLAGS := $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) CXXFLAGS := $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS)
YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm X86ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
NVCCFLAGS += -ptx NVCCFLAGS += -ptx
HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS) HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
@ -73,13 +73,13 @@ COMPILE_NVCC = $(call COMPILE,NVCC)
%_host.o: %.c %_host.o: %.c
$(COMPILE_HOSTC) $(COMPILE_HOSTC)
%$(DEFAULT_YASMD).asm: %.asm %$(DEFAULT_X86ASMD).asm: %.asm
$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.asm=.d) $(DEPX86ASM) $(X86ASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.asm=.d)
$(YASM) $(YASMFLAGS) -I $(<D)/ -e $< | sed '/^%/d;/^$$/d;' > $@ $(X86ASM) $(X86ASMFLAGS) -I $(<D)/ -e $< | sed '/^%/d;/^$$/d;' > $@
%.o: %.asm %.o: %.asm
$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) $(DEPX86ASM) $(X86ASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $(X86ASM) $(X86ASMFLAGS) -I $(<D)/ -o $@ $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<)
-$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@) -$(if $(ASMSTRIPFLAGS), $(STRIP) $(ASMSTRIPFLAGS) $@)
%.o: %.rc %.o: %.rc
@ -163,7 +163,7 @@ $(TOOLOBJS): | tools
OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS)) OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOBJS) $(HOSTOBJS) $(SLIBOBJS) $(TESTOBJS))
CLEANSUFFIXES = *.d *.o *~ *.h.c *.gcda *.gcno *.map *.ver *.version *.ho *$(DEFAULT_YASMD).asm *.ptx *.ptx.c CLEANSUFFIXES = *.d *.o *~ *.h.c *.gcda *.gcno *.map *.ver *.version *.ho *$(DEFAULT_X86ASMD).asm *.ptx *.ptx.c
DISTCLEANSUFFIXES = *.pc DISTCLEANSUFFIXES = *.pc
LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a
@ -174,4 +174,4 @@ endef
$(eval $(RULES)) $(eval $(RULES))
-include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_YASMD).d) -include $(wildcard $(OBJS:.o=.d) $(HOSTOBJS:.o=.d) $(TESTOBJS:.o=.d) $(HOBJS:.o=.d) $(SLIBOBJS:.o=.d)) $(OBJS:.o=$(DEFAULT_X86ASMD).d)

10
libavcodec/tests/x86/dct.c
View File

@ -22,7 +22,7 @@
#include "libavcodec/x86/xvididct.h" #include "libavcodec/x86/xvididct.h"
#include "libavcodec/x86/simple_idct.h" #include "libavcodec/x86/simple_idct.h"
#if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_YASM #if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_X86ASM
void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize, void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize,
int16_t *block, int16_t *qmat); int16_t *block, int16_t *qmat);
@ -70,7 +70,7 @@ static const struct algo idct_tab_arch[] = {
#if HAVE_MMX_EXTERNAL #if HAVE_MMX_EXTERNAL
{ "SIMPLE-MMX", ff_simple_idct_mmx, FF_IDCT_PERM_SIMPLE, AV_CPU_FLAG_MMX }, { "SIMPLE-MMX", ff_simple_idct_mmx, FF_IDCT_PERM_SIMPLE, AV_CPU_FLAG_MMX },
#endif #endif
#if CONFIG_MPEG4_DECODER && HAVE_YASM #if CONFIG_MPEG4_DECODER && HAVE_X86ASM
#if ARCH_X86_32 #if ARCH_X86_32
{ "XVID-MMX", ff_xvid_idct_mmx, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMX, 1 }, { "XVID-MMX", ff_xvid_idct_mmx, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMX, 1 },
{ "XVID-MMXEXT", ff_xvid_idct_mmxext, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMXEXT, 1 }, { "XVID-MMXEXT", ff_xvid_idct_mmxext, FF_IDCT_PERM_NONE, AV_CPU_FLAG_MMXEXT, 1 },
@ -78,14 +78,14 @@ static const struct algo idct_tab_arch[] = {
#if HAVE_SSE2_EXTERNAL #if HAVE_SSE2_EXTERNAL
{ "XVID-SSE2", ff_xvid_idct_sse2, FF_IDCT_PERM_SSE2, AV_CPU_FLAG_SSE2, 1 }, { "XVID-SSE2", ff_xvid_idct_sse2, FF_IDCT_PERM_SSE2, AV_CPU_FLAG_SSE2, 1 },
#endif #endif
#endif /* CONFIG_MPEG4_DECODER && HAVE_YASM */ #endif /* CONFIG_MPEG4_DECODER && HAVE_X86ASM */
#if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_YASM #if (CONFIG_PRORES_DECODER || CONFIG_PRORES_LGPL_DECODER) && ARCH_X86_64 && HAVE_X86ASM
{ "PR-SSE2", ff_prores_idct_put_10_sse2_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 }, { "PR-SSE2", ff_prores_idct_put_10_sse2_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 },
# if HAVE_AVX_EXTERNAL # if HAVE_AVX_EXTERNAL
{ "PR-AVX", ff_prores_idct_put_10_avx_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX, 1 }, { "PR-AVX", ff_prores_idct_put_10_avx_wrap, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX, 1 },
# endif # endif
#endif #endif
#if HAVE_YASM #if HAVE_X86ASM
#if ARCH_X86_64 #if ARCH_X86_64
#if HAVE_SSE2_EXTERNAL #if HAVE_SSE2_EXTERNAL
{ "SIMPLE10-SSE2", ff_simple_idct10_sse2, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2}, { "SIMPLE10-SSE2", ff_simple_idct10_sse2, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2},

124
libavcodec/x86/Makefile
View File

@ -86,95 +86,95 @@ MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp.o
MMX-OBJS-$(CONFIG_SNOW_ENCODER) += x86/snowdsp.o MMX-OBJS-$(CONFIG_SNOW_ENCODER) += x86/snowdsp.o
# subsystems # subsystems
YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o \ X86ASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o \
x86/ac3dsp_downmix.o x86/ac3dsp_downmix.o
YASM-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp.o X86ASM-OBJS-$(CONFIG_AUDIODSP) += x86/audiodsp.o
YASM-OBJS-$(CONFIG_BLOCKDSP) += x86/blockdsp.o X86ASM-OBJS-$(CONFIG_BLOCKDSP) += x86/blockdsp.o
YASM-OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp.o X86ASM-OBJS-$(CONFIG_BSWAPDSP) += x86/bswapdsp.o
YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o X86ASM-OBJS-$(CONFIG_DCT) += x86/dct32.o
YASM-OBJS-$(CONFIG_FFT) += x86/fft.o X86ASM-OBJS-$(CONFIG_FFT) += x86/fft.o
YASM-OBJS-$(CONFIG_FMTCONVERT) += x86/fmtconvert.o X86ASM-OBJS-$(CONFIG_FMTCONVERT) += x86/fmtconvert.o
YASM-OBJS-$(CONFIG_H263DSP) += x86/h263_loopfilter.o X86ASM-OBJS-$(CONFIG_H263DSP) += x86/h263_loopfilter.o
YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \ X86ASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \
x86/h264_chromamc_10bit.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_deblock_10bit.o \
x86/h264_idct.o \ x86/h264_idct.o \
x86/h264_idct_10bit.o \ x86/h264_idct_10bit.o \
x86/h264_weight.o \ x86/h264_weight.o \
x86/h264_weight_10bit.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 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/h264_qpel_10bit.o \
x86/fpel.o \ x86/fpel.o \
x86/qpel.o x86/qpel.o
YASM-OBJS-$(CONFIG_HPELDSP) += x86/fpel.o \ X86ASM-OBJS-$(CONFIG_HPELDSP) += x86/fpel.o \
x86/hpeldsp.o x86/hpeldsp.o
YASM-OBJS-$(CONFIG_HUFFYUVDSP) += x86/huffyuvdsp.o X86ASM-OBJS-$(CONFIG_HUFFYUVDSP) += x86/huffyuvdsp.o
YASM-OBJS-$(CONFIG_HUFFYUVENCDSP) += x86/huffyuvencdsp.o X86ASM-OBJS-$(CONFIG_HUFFYUVENCDSP) += x86/huffyuvencdsp.o
YASM-OBJS-$(CONFIG_IDCTDSP) += x86/idctdsp.o X86ASM-OBJS-$(CONFIG_IDCTDSP) += x86/idctdsp.o
YASM-OBJS-$(CONFIG_LLAUDDSP) += x86/lossless_audiodsp.o X86ASM-OBJS-$(CONFIG_LLAUDDSP) += x86/lossless_audiodsp.o
YASM-OBJS-$(CONFIG_LLVIDDSP) += x86/lossless_videodsp.o X86ASM-OBJS-$(CONFIG_LLVIDDSP) += x86/lossless_videodsp.o
YASM-OBJS-$(CONFIG_LLVIDENCDSP) += x86/lossless_videoencdsp.o X86ASM-OBJS-$(CONFIG_LLVIDENCDSP) += x86/lossless_videoencdsp.o
YASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o X86ASM-OBJS-$(CONFIG_ME_CMP) += x86/me_cmp.o
YASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o X86ASM-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/imdct36.o
YASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o X86ASM-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoencdsp.o
YASM-OBJS-$(CONFIG_PIXBLOCKDSP) += x86/pixblockdsp.o X86ASM-OBJS-$(CONFIG_PIXBLOCKDSP) += x86/pixblockdsp.o
YASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \ X86ASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \
x86/fpel.o \ x86/fpel.o \
x86/qpel.o x86/qpel.o
YASM-OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp.o X86ASM-OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp.o
YASM-OBJS-$(CONFIG_VC1DSP) += x86/vc1dsp_loopfilter.o \ X86ASM-OBJS-$(CONFIG_VC1DSP) += x86/vc1dsp_loopfilter.o \
x86/vc1dsp_mc.o x86/vc1dsp_mc.o
YASM-OBJS-$(CONFIG_IDCTDSP) += x86/simple_idct10.o \ X86ASM-OBJS-$(CONFIG_IDCTDSP) += x86/simple_idct10.o \
x86/simple_idct.o x86/simple_idct.o
YASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o X86ASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o
YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o X86ASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
YASM-OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp.o \ X86ASM-OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp.o \
x86/vp8dsp_loopfilter.o x86/vp8dsp_loopfilter.o
# decoders/encoders # decoders/encoders
YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/aacpsdsp.o \ X86ASM-OBJS-$(CONFIG_AAC_DECODER) += x86/aacpsdsp.o \
x86/sbrdsp.o x86/sbrdsp.o
YASM-OBJS-$(CONFIG_AAC_ENCODER) += x86/aacencdsp.o X86ASM-OBJS-$(CONFIG_AAC_ENCODER) += x86/aacencdsp.o
YASM-OBJS-$(CONFIG_ADPCM_G722_DECODER) += x86/g722dsp.o X86ASM-OBJS-$(CONFIG_ADPCM_G722_DECODER) += x86/g722dsp.o
YASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += x86/g722dsp.o X86ASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += x86/g722dsp.o
YASM-OBJS-$(CONFIG_ALAC_DECODER) += x86/alacdsp.o X86ASM-OBJS-$(CONFIG_ALAC_DECODER) += x86/alacdsp.o
YASM-OBJS-$(CONFIG_APNG_DECODER) += x86/pngdsp.o X86ASM-OBJS-$(CONFIG_APNG_DECODER) += x86/pngdsp.o
YASM-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsidct.o X86ASM-OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsidct.o
YASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o x86/synth_filter.o X86ASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o x86/synth_filter.o
YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp.o \ X86ASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp.o \
x86/dirac_dwt.o x86/dirac_dwt.o
YASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o X86ASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o
YASM-OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp.o X86ASM-OBJS-$(CONFIG_FLAC_DECODER) += x86/flacdsp.o
ifdef CONFIG_GPL ifdef CONFIG_GPL
YASM-OBJS-$(CONFIG_FLAC_ENCODER) += x86/flac_dsp_gpl.o X86ASM-OBJS-$(CONFIG_FLAC_ENCODER) += x86/flac_dsp_gpl.o
endif endif
YASM-OBJS-$(CONFIG_HEVC_DECODER) += x86/hevc_add_res.o \ X86ASM-OBJS-$(CONFIG_HEVC_DECODER) += x86/hevc_add_res.o \
x86/hevc_deblock.o \ x86/hevc_deblock.o \
x86/hevc_idct.o \ x86/hevc_idct.o \
x86/hevc_mc.o \ x86/hevc_mc.o \
x86/hevc_sao.o \ x86/hevc_sao.o \
x86/hevc_sao_10bit.o x86/hevc_sao_10bit.o
YASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o X86ASM-OBJS-$(CONFIG_JPEG2000_DECODER) += x86/jpeg2000dsp.o
YASM-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o X86ASM-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
YASM-OBJS-$(CONFIG_MPEG4_DECODER) += x86/xvididct.o X86ASM-OBJS-$(CONFIG_MPEG4_DECODER) += x86/xvididct.o
YASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o X86ASM-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp.o
YASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o X86ASM-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp.o
YASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o X86ASM-OBJS-$(CONFIG_PRORES_LGPL_DECODER) += x86/proresdsp.o
YASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o X86ASM-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o
YASM-OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc.o X86ASM-OBJS-$(CONFIG_SVQ1_ENCODER) += x86/svq1enc.o
YASM-OBJS-$(CONFIG_TAK_DECODER) += x86/takdsp.o X86ASM-OBJS-$(CONFIG_TAK_DECODER) += x86/takdsp.o
YASM-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o X86ASM-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o
YASM-OBJS-$(CONFIG_TTA_DECODER) += x86/ttadsp.o X86ASM-OBJS-$(CONFIG_TTA_DECODER) += x86/ttadsp.o
YASM-OBJS-$(CONFIG_TTA_ENCODER) += x86/ttaencdsp.o X86ASM-OBJS-$(CONFIG_TTA_ENCODER) += x86/ttaencdsp.o
YASM-OBJS-$(CONFIG_V210_ENCODER) += x86/v210enc.o X86ASM-OBJS-$(CONFIG_V210_ENCODER) += x86/v210enc.o
YASM-OBJS-$(CONFIG_V210_DECODER) += x86/v210.o X86ASM-OBJS-$(CONFIG_V210_DECODER) += x86/v210.o
YASM-OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp.o X86ASM-OBJS-$(CONFIG_VORBIS_DECODER) += x86/vorbisdsp.o
YASM-OBJS-$(CONFIG_VP3_DECODER) += x86/hpeldsp_vp3.o X86ASM-OBJS-$(CONFIG_VP3_DECODER) += x86/hpeldsp_vp3.o
YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp.o X86ASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp.o
YASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9intrapred.o \ X86ASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9intrapred.o \
x86/vp9intrapred_16bpp.o \ x86/vp9intrapred_16bpp.o \
x86/vp9itxfm.o \ x86/vp9itxfm.o \
x86/vp9itxfm_16bpp.o \ x86/vp9itxfm_16bpp.o \
@ -182,4 +182,4 @@ YASM-OBJS-$(CONFIG_VP9_DECODER) += x86/vp9intrapred.o \
x86/vp9lpf_16bpp.o \ x86/vp9lpf_16bpp.o \
x86/vp9mc.o \ x86/vp9mc.o \
x86/vp9mc_16bpp.o x86/vp9mc_16bpp.o
YASM-OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp.o X86ASM-OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp.o

4
libavcodec/x86/alacdsp_init.c
View File

@ -30,7 +30,7 @@ void ff_alac_append_extra_bits_mono_sse2(int32_t *buffer[2], int32_t *extra_bits
av_cold void ff_alacdsp_init_x86(ALACDSPContext *c) av_cold void ff_alacdsp_init_x86(ALACDSPContext *c)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_SSE2(cpu_flags)) { if (EXTERNAL_SSE2(cpu_flags)) {
@ -40,5 +40,5 @@ av_cold void ff_alacdsp_init_x86(ALACDSPContext *c)
if (EXTERNAL_SSE4(cpu_flags)) { if (EXTERNAL_SSE4(cpu_flags)) {
c->decorrelate_stereo = ff_alac_decorrelate_stereo_sse4; c->decorrelate_stereo = ff_alac_decorrelate_stereo_sse4;
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

4
libavcodec/x86/blockdsp_init.c
View File

@ -34,7 +34,7 @@ void ff_clear_blocks_sse(int16_t *blocks);
av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, av_cold void ff_blockdsp_init_x86(BlockDSPContext *c,
AVCodecContext *avctx) AVCodecContext *avctx)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMX(cpu_flags)) { if (EXTERNAL_MMX(cpu_flags)) {
@ -50,5 +50,5 @@ av_cold void ff_blockdsp_init_x86(BlockDSPContext *c,
c->clear_block = ff_clear_block_sse; c->clear_block = ff_clear_block_sse;
c->clear_blocks = ff_clear_blocks_sse; c->clear_blocks = ff_clear_blocks_sse;
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

6
libavcodec/x86/dirac_dwt_init.c
View File

@ -133,7 +133,7 @@ static void horizontal_compose_haar1i##ext(uint8_t *_b, uint8_t *_tmp, int w)\
}\ }\
\ \
#if HAVE_YASM #if HAVE_X86ASM
#if !ARCH_X86_64 #if !ARCH_X86_64
COMPOSE_VERTICAL(_mmx, 4) COMPOSE_VERTICAL(_mmx, 4)
#endif #endif
@ -160,7 +160,7 @@ static void horizontal_compose_dd97i_ssse3(uint8_t *_b, uint8_t *_tmp, int w)
void ff_spatial_idwt_init_x86(DWTContext *d, enum dwt_type type) void ff_spatial_idwt_init_x86(DWTContext *d, enum dwt_type type)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
#if !ARCH_X86_64 #if !ARCH_X86_64
@ -225,5 +225,5 @@ void ff_spatial_idwt_init_x86(DWTContext *d, enum dwt_type type)
d->horizontal_compose = horizontal_compose_dd97i_ssse3; d->horizontal_compose = horizontal_compose_dd97i_ssse3;
break; break;
} }
#endif // HAVE_YASM #endif // HAVE_X86ASM
} }

6
libavcodec/x86/diracdsp_init.c
View File

@ -49,7 +49,7 @@ void ff_put_signed_rect_clamped_10_sse4(uint8_t *dst, int dst_stride, const uint
void ff_dequant_subband_32_sse4(uint8_t *src, uint8_t *dst, ptrdiff_t stride, const int qf, const int qs, int tot_v, int tot_h); void ff_dequant_subband_32_sse4(uint8_t *src, uint8_t *dst, ptrdiff_t stride, const int qf, const int qs, int tot_v, int tot_h);
#if HAVE_YASM #if HAVE_X86ASM
#define HPEL_FILTER(MMSIZE, EXT) \ #define HPEL_FILTER(MMSIZE, EXT) \
void ff_dirac_hpel_filter_v_ ## EXT(uint8_t *, const uint8_t *, int, int); \ void ff_dirac_hpel_filter_v_ ## EXT(uint8_t *, const uint8_t *, int, int); \
@ -138,7 +138,7 @@ void ff_avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride,
} }
} }
#else // HAVE_YASM #else // HAVE_X86ASM
#define HPEL_FILTER(MMSIZE, EXT) \ #define HPEL_FILTER(MMSIZE, EXT) \
void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, \ void dirac_hpel_filter_ ## EXT(uint8_t *dsth, uint8_t *dstv, uint8_t *dstc, \
@ -146,7 +146,7 @@ void ff_avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride,
#define PIXFUNC(PFX, IDX, EXT) do {} while (0) #define PIXFUNC(PFX, IDX, EXT) do {} while (0)
#endif // HAVE_YASM #endif // HAVE_X86ASM
#if !ARCH_X86_64 #if !ARCH_X86_64
HPEL_FILTER(8, mmx) HPEL_FILTER(8, mmx)

4
libavcodec/x86/flacdsp_init.c
View File

@ -53,7 +53,7 @@ DECORRELATE_FUNCS(32, avx);
av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels, av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int channels,
int bps) int bps)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
#if CONFIG_FLAC_DECODER #if CONFIG_FLAC_DECODER
@ -111,5 +111,5 @@ av_cold void ff_flacdsp_init_x86(FLACDSPContext *c, enum AVSampleFormat fmt, int
c->lpc16_encode = ff_flac_enc_lpc_16_sse4; c->lpc16_encode = ff_flac_enc_lpc_16_sse4;
} }
#endif #endif
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

8
libavcodec/x86/fmtconvert_init.c
View File

@ -27,7 +27,7 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/fmtconvert.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_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); void ff_int32_to_float_fmul_scalar_sse2(float *dst, const int32_t *src, float mul, int len);
@ -36,11 +36,11 @@ void ff_int32_to_float_fmul_array8_sse (FmtConvertContext *c, float *dst, const
void ff_int32_to_float_fmul_array8_sse2(FmtConvertContext *c, float *dst, const int32_t *src, void ff_int32_to_float_fmul_array8_sse2(FmtConvertContext *c, float *dst, const int32_t *src,
const float *mul, int len); const float *mul, int len);
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) 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(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_SSE(cpu_flags)) { if (EXTERNAL_SSE(cpu_flags)) {
@ -51,5 +51,5 @@ av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx
c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2; c->int32_to_float_fmul_scalar = ff_int32_to_float_fmul_scalar_sse2;
c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_sse2; c->int32_to_float_fmul_array8 = ff_int32_to_float_fmul_array8_sse2;
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

6
libavcodec/x86/h264_qpel.c
View File

@ -28,7 +28,7 @@
#include "libavcodec/pixels.h" #include "libavcodec/pixels.h"
#include "fpel.h" #include "fpel.h"
#if HAVE_YASM #if HAVE_X86ASM
void ff_put_pixels4_l2_mmxext(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, void ff_put_pixels4_l2_mmxext(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
int dstStride, int src1Stride, int h); int dstStride, int src1Stride, int h);
void ff_avg_pixels4_l2_mmxext(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, void ff_avg_pixels4_l2_mmxext(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
@ -499,7 +499,7 @@ QPEL16_OP(mc33, MMX)
QPEL16(mmxext) QPEL16(mmxext)
#endif #endif
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \ #define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \
do { \ do { \
@ -539,7 +539,7 @@ QPEL16(mmxext)
av_cold void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth) 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 high_bit_depth = bit_depth > 8;
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

2
libavcodec/x86/h264dsp_init.c
View File

@ -228,7 +228,7 @@ H264_BIWEIGHT_10_SSE(4, 10)
av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
const int chroma_format_idc) const int chroma_format_idc)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMXEXT(cpu_flags) && chroma_format_idc <= 1) if (EXTERNAL_MMXEXT(cpu_flags) && chroma_format_idc <= 1)

4
libavcodec/x86/hpeldsp_init.c
View File

@ -148,7 +148,7 @@ CALL_2X_PIXELS_EXPORT(ff_put_pixels16_xy2_mmx, ff_put_pixels8_xy2_mmx, 8)
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
#if HAVE_YASM #if HAVE_X86ASM
#define HPELDSP_AVG_PIXELS16(CPUEXT) \ #define HPELDSP_AVG_PIXELS16(CPUEXT) \
CALL_2X_PIXELS(put_no_rnd_pixels16_x2 ## CPUEXT, ff_put_no_rnd_pixels8_x2 ## CPUEXT, 8) \ CALL_2X_PIXELS(put_no_rnd_pixels16_x2 ## CPUEXT, ff_put_no_rnd_pixels8_x2 ## CPUEXT, 8) \
@ -163,7 +163,7 @@ CALL_2X_PIXELS_EXPORT(ff_put_pixels16_xy2_mmx, ff_put_pixels8_xy2_mmx, 8)
HPELDSP_AVG_PIXELS16(_3dnow) HPELDSP_AVG_PIXELS16(_3dnow)
HPELDSP_AVG_PIXELS16(_mmxext) HPELDSP_AVG_PIXELS16(_mmxext)
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
#define SET_HPEL_FUNCS_EXT(PFX, IDX, SIZE, CPU) \ #define SET_HPEL_FUNCS_EXT(PFX, IDX, SIZE, CPU) \
if (HAVE_MMX_EXTERNAL) \ if (HAVE_MMX_EXTERNAL) \

2
libavcodec/x86/lossless_audiodsp_init.c
View File

@ -37,7 +37,7 @@ int32_t ff_scalarproduct_and_madd_int32_sse4(int16_t *v1, const int32_t *v2,
av_cold void ff_llauddsp_init_x86(LLAudDSPContext *c) av_cold void ff_llauddsp_init_x86(LLAudDSPContext *c)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMXEXT(cpu_flags)) if (EXTERNAL_MMXEXT(cpu_flags))

6
libavcodec/x86/me_cmp_init.c
View File

@ -89,7 +89,7 @@ hadamard_func(mmxext)
hadamard_func(sse2) hadamard_func(sse2)
hadamard_func(ssse3) hadamard_func(ssse3)
#if HAVE_YASM #if HAVE_X86ASM
static int nsse16_mmx(MpegEncContext *c, uint8_t *pix1, uint8_t *pix2, static int nsse16_mmx(MpegEncContext *c, uint8_t *pix1, uint8_t *pix2,
ptrdiff_t stride, int h) ptrdiff_t stride, int h)
{ {
@ -121,7 +121,7 @@ static int nsse8_mmx(MpegEncContext *c, uint8_t *pix1, uint8_t *pix2,
return score1 + FFABS(score2) * 8; return score1 + FFABS(score2) * 8;
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
@ -586,7 +586,7 @@ av_cold void ff_me_cmp_init_x86(MECmpContext *c, AVCodecContext *avctx)
c->sum_abs_dctelem = ff_sum_abs_dctelem_mmx; c->sum_abs_dctelem = ff_sum_abs_dctelem_mmx;
c->sse[0] = ff_sse16_mmx; c->sse[0] = ff_sse16_mmx;
c->sse[1] = ff_sse8_mmx; c->sse[1] = ff_sse8_mmx;
#if HAVE_YASM #if HAVE_X86ASM
c->nsse[0] = nsse16_mmx; c->nsse[0] = nsse16_mmx;
c->nsse[1] = nsse8_mmx; c->nsse[1] = nsse8_mmx;
#endif #endif

12
libavcodec/x86/mpegaudiodsp.c
View File

@ -30,7 +30,7 @@
static void imdct36_blocks_ ## CPU(float *out, float *buf, float *in, int count, int switch_point, int block_type);\ static void imdct36_blocks_ ## CPU(float *out, float *buf, float *in, int count, int switch_point, int block_type);\
void ff_imdct36_float_ ## CPU(float *out, float *buf, float *in, float *win); void ff_imdct36_float_ ## CPU(float *out, float *buf, float *in, float *win);
#if HAVE_YASM #if HAVE_X86ASM
#if ARCH_X86_32 #if ARCH_X86_32
DECL(sse) DECL(sse)
#endif #endif
@ -38,7 +38,7 @@ DECL(sse2)
DECL(sse3) DECL(sse3)
DECL(ssse3) DECL(ssse3)
DECL(avx) DECL(avx)
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win, void ff_four_imdct36_float_sse(float *out, float *buf, float *in, float *win,
float *tmpbuf); float *tmpbuf);
@ -193,7 +193,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out,
#endif /* HAVE_6REGS && HAVE_SSE_INLINE */ #endif /* HAVE_6REGS && HAVE_SSE_INLINE */
#if HAVE_YASM #if HAVE_X86ASM
#define DECL_IMDCT_BLOCKS(CPU1, CPU2) \ #define DECL_IMDCT_BLOCKS(CPU1, CPU2) \
static void imdct36_blocks_ ## CPU1(float *out, float *buf, float *in, \ static void imdct36_blocks_ ## CPU1(float *out, float *buf, float *in, \
int count, int switch_point, int block_type) \ int count, int switch_point, int block_type) \
@ -237,7 +237,7 @@ DECL_IMDCT_BLOCKS(ssse3,sse)
#if HAVE_AVX_EXTERNAL #if HAVE_AVX_EXTERNAL
DECL_IMDCT_BLOCKS(avx,avx) DECL_IMDCT_BLOCKS(avx,avx)
#endif #endif
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
av_cold void ff_mpadsp_init_x86(MPADSPContext *s) av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
{ {
@ -263,7 +263,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
} }
#endif /* HAVE_SSE_INLINE */ #endif /* HAVE_SSE_INLINE */
#if HAVE_YASM #if HAVE_X86ASM
#if HAVE_SSE #if HAVE_SSE
#if ARCH_X86_32 #if ARCH_X86_32
if (EXTERNAL_SSE(cpu_flags)) { if (EXTERNAL_SSE(cpu_flags)) {
@ -285,5 +285,5 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
s->imdct36_blocks_float = imdct36_blocks_avx; s->imdct36_blocks_float = imdct36_blocks_avx;
} }
#endif #endif
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

4
libavcodec/x86/qpeldsp_init.c
View File

@ -82,7 +82,7 @@ void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst,
#define ff_put_no_rnd_pixels16_mmxext ff_put_pixels16_mmx #define ff_put_no_rnd_pixels16_mmxext ff_put_pixels16_mmx
#define ff_put_no_rnd_pixels8_mmxext ff_put_pixels8_mmx #define ff_put_no_rnd_pixels8_mmxext ff_put_pixels8_mmx
#if HAVE_YASM #if HAVE_X86ASM
#define ff_put_pixels16_mmxext ff_put_pixels16_mmx #define ff_put_pixels16_mmxext ff_put_pixels16_mmx
#define ff_put_pixels8_mmxext ff_put_pixels8_mmx #define ff_put_pixels8_mmxext ff_put_pixels8_mmx
@ -504,7 +504,7 @@ QPEL_OP(put_, _, mmxext)
QPEL_OP(avg_, _, mmxext) QPEL_OP(avg_, _, mmxext)
QPEL_OP(put_no_rnd_, _no_rnd_, mmxext) QPEL_OP(put_no_rnd_, _no_rnd_, mmxext)
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
#define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \ #define SET_QPEL_FUNCS(PFX, IDX, SIZE, CPU, PREFIX) \
do { \ do { \

8
libavcodec/x86/rv40dsp_init.c
View File

@ -39,7 +39,7 @@ static void op##_rv40_qpel##size##_mc33_##insn(uint8_t *dst, const uint8_t *src,
ff_##op##_pixels##size##_xy2_##insn(dst, src, stride, size); \ ff_##op##_pixels##size##_xy2_##insn(dst, src, stride, size); \
} }
#if HAVE_YASM #if HAVE_X86ASM
void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src, void ff_put_rv40_chroma_mc8_mmx (uint8_t *dst, uint8_t *src,
ptrdiff_t stride, int h, int x, int y); ptrdiff_t stride, int h, int x, int y);
void ff_avg_rv40_chroma_mc8_mmxext(uint8_t *dst, uint8_t *src, void ff_avg_rv40_chroma_mc8_mmxext(uint8_t *dst, uint8_t *src,
@ -203,7 +203,7 @@ DEFINE_FN(avg, 8, ssse3)
DEFINE_FN(avg, 16, sse2) DEFINE_FN(avg, 16, sse2)
DEFINE_FN(avg, 16, ssse3) DEFINE_FN(avg, 16, ssse3)
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
#if HAVE_MMX_INLINE #if HAVE_MMX_INLINE
DEFINE_FN(put, 8, mmx) DEFINE_FN(put, 8, mmx)
@ -225,7 +225,7 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c)
} }
#endif /* HAVE_MMX_INLINE */ #endif /* HAVE_MMX_INLINE */
#if HAVE_YASM #if HAVE_X86ASM
if (EXTERNAL_MMX(cpu_flags)) { if (EXTERNAL_MMX(cpu_flags)) {
c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx; c->put_chroma_pixels_tab[0] = ff_put_rv40_chroma_mc8_mmx;
c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx; c->put_chroma_pixels_tab[1] = ff_put_rv40_chroma_mc4_mmx;
@ -274,5 +274,5 @@ av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c)
QPEL_MC_SET(put_, _ssse3) QPEL_MC_SET(put_, _ssse3)
QPEL_MC_SET(avg_, _ssse3) QPEL_MC_SET(avg_, _ssse3)
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

8
libavcodec/x86/synth_filter_init.c
View File

@ -42,18 +42,18 @@ static void synth_filter_##opt(FFTContext *imdct, \
*synth_buf_offset = (*synth_buf_offset - 32) & 511; \ *synth_buf_offset = (*synth_buf_offset - 32) & 511; \
} \ } \
#if HAVE_YASM #if HAVE_X86ASM
#if ARCH_X86_32 #if ARCH_X86_32
SYNTH_FILTER_FUNC(sse) SYNTH_FILTER_FUNC(sse)
#endif #endif
SYNTH_FILTER_FUNC(sse2) SYNTH_FILTER_FUNC(sse2)
SYNTH_FILTER_FUNC(avx) SYNTH_FILTER_FUNC(avx)
SYNTH_FILTER_FUNC(fma3) SYNTH_FILTER_FUNC(fma3)
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
av_cold void ff_synth_filter_init_x86(SynthFilterContext *s) av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
#if ARCH_X86_32 #if ARCH_X86_32
@ -70,5 +70,5 @@ av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
if (EXTERNAL_FMA3_FAST(cpu_flags)) { if (EXTERNAL_FMA3_FAST(cpu_flags)) {
s->synth_filter_float = synth_filter_fma3; s->synth_filter_float = synth_filter_fma3;
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

2
libavcodec/x86/takdsp_init.c
View File

@ -29,7 +29,7 @@ void ff_tak_decorrelate_sf_sse4(int32_t *p1, int32_t *p2, int length, int dshift
av_cold void ff_takdsp_init_x86(TAKDSPContext *c) av_cold void ff_takdsp_init_x86(TAKDSPContext *c)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_SSE2(cpu_flags)) { if (EXTERNAL_SSE2(cpu_flags)) {

2
libavcodec/x86/ttadsp_init.c
View File

@ -31,7 +31,7 @@ void ff_tta_filter_process_sse4(int32_t *qm, int32_t *dx, int32_t *dl,
av_cold void ff_ttadsp_init_x86(TTADSPContext *c) av_cold void ff_ttadsp_init_x86(TTADSPContext *c)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_SSSE3(cpu_flags)) if (EXTERNAL_SSSE3(cpu_flags))

2
libavcodec/x86/ttaencdsp_init.c
View File

@ -31,7 +31,7 @@ void ff_ttaenc_filter_process_sse4(int32_t *qm, int32_t *dx, int32_t *dl,
av_cold void ff_ttaencdsp_init_x86(TTAEncDSPContext *c) av_cold void ff_ttaencdsp_init_x86(TTAEncDSPContext *c)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_SSSE3(cpu_flags)) if (EXTERNAL_SSSE3(cpu_flags))

2
libavcodec/x86/v210-init.c
View File

@ -27,7 +27,7 @@ extern void ff_v210_planar_unpack_aligned_avx(const uint32_t *src, uint16_t *y,
av_cold void ff_v210_x86_init(V210DecContext *s) av_cold void ff_v210_x86_init(V210DecContext *s)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (s->aligned_input) { if (s->aligned_input) {

8
libavcodec/x86/vc1dsp_init.c
View File

@ -51,7 +51,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); \ ff_vc1_h_loop_filter8_ ## EXT(src+8*stride, stride, pq); \
} }
#if HAVE_YASM #if HAVE_X86ASM
LOOP_FILTER(mmxext) LOOP_FILTER(mmxext)
LOOP_FILTER(sse2) LOOP_FILTER(sse2)
LOOP_FILTER(ssse3) LOOP_FILTER(ssse3)
@ -80,7 +80,7 @@ DECLARE_FUNCTION(avg_, 16, _mmxext)
DECLARE_FUNCTION(put_, 16, _sse2) DECLARE_FUNCTION(put_, 16, _sse2)
DECLARE_FUNCTION(avg_, 16, _sse2) DECLARE_FUNCTION(avg_, 16, _sse2)
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
void ff_put_vc1_chroma_mc8_nornd_mmx (uint8_t *dst, uint8_t *src, void ff_put_vc1_chroma_mc8_nornd_mmx (uint8_t *dst, uint8_t *src,
ptrdiff_t stride, int h, int x, int y); ptrdiff_t stride, int h, int x, int y);
@ -122,7 +122,7 @@ av_cold void ff_vc1dsp_init_x86(VC1DSPContext *dsp)
dsp->vc1_v_loop_filter16 = vc1_v_loop_filter16_ ## EXT; \ dsp->vc1_v_loop_filter16 = vc1_v_loop_filter16_ ## EXT; \
dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_ ## EXT dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_ ## EXT
#if HAVE_YASM #if HAVE_X86ASM
if (EXTERNAL_MMX(cpu_flags)) { if (EXTERNAL_MMX(cpu_flags)) {
dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_nornd_mmx; dsp->put_no_rnd_vc1_chroma_pixels_tab[0] = ff_put_vc1_chroma_mc8_nornd_mmx;
@ -164,5 +164,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_filter8 = ff_vc1_h_loop_filter8_sse4;
dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_sse4; dsp->vc1_h_loop_filter16 = vc1_h_loop_filter16_sse4;
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

8
libavcodec/x86/videodsp_init.c
View File

@ -29,7 +29,7 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/videodsp.h" #include "libavcodec/videodsp.h"
#if HAVE_YASM #if HAVE_X86ASM
typedef void emu_edge_vfix_func(uint8_t *dst, x86_reg dst_stride, typedef void emu_edge_vfix_func(uint8_t *dst, x86_reg dst_stride,
const uint8_t *src, x86_reg src_stride, const uint8_t *src, x86_reg src_stride,
x86_reg start_y, x86_reg end_y, x86_reg bh); x86_reg start_y, x86_reg end_y, x86_reg bh);
@ -271,14 +271,14 @@ static av_noinline void emulated_edge_mc_avx2(uint8_t *buf, const uint8_t *src,
hfixtbl_avx2, &ff_emu_edge_hvar_avx2); hfixtbl_avx2, &ff_emu_edge_hvar_avx2);
} }
#endif /* HAVE_AVX2_EXTERNAL */ #endif /* HAVE_AVX2_EXTERNAL */
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
void ff_prefetch_mmxext(uint8_t *buf, ptrdiff_t stride, int h); void ff_prefetch_mmxext(uint8_t *buf, ptrdiff_t stride, int h);
void ff_prefetch_3dnow(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) av_cold void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
#if ARCH_X86_32 #if ARCH_X86_32
@ -305,5 +305,5 @@ av_cold void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc)
ctx->emulated_edge_mc = emulated_edge_mc_avx2; ctx->emulated_edge_mc = emulated_edge_mc_avx2;
} }
#endif #endif
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

12
libavcodec/x86/vp8dsp_init.c
View File

@ -26,7 +26,7 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/vp8dsp.h" #include "libavcodec/vp8dsp.h"
#if HAVE_YASM #if HAVE_X86ASM
/* /*
* MC functions * MC functions
@ -290,7 +290,7 @@ DECLARE_LOOP_FILTER(sse2)
DECLARE_LOOP_FILTER(ssse3) DECLARE_LOOP_FILTER(ssse3)
DECLARE_LOOP_FILTER(sse4) DECLARE_LOOP_FILTER(sse4)
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
#define VP8_LUMA_MC_FUNC(IDX, SIZE, OPT) \ #define VP8_LUMA_MC_FUNC(IDX, SIZE, OPT) \
c->put_vp8_epel_pixels_tab[IDX][0][2] = ff_put_vp8_epel ## SIZE ## _h6_ ## OPT; \ c->put_vp8_epel_pixels_tab[IDX][0][2] = ff_put_vp8_epel ## SIZE ## _h6_ ## OPT; \
@ -318,7 +318,7 @@ DECLARE_LOOP_FILTER(sse4)
av_cold void ff_vp78dsp_init_x86(VP8DSPContext *c) av_cold void ff_vp78dsp_init_x86(VP8DSPContext *c)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMX(cpu_flags)) { if (EXTERNAL_MMX(cpu_flags)) {
@ -363,12 +363,12 @@ av_cold void ff_vp78dsp_init_x86(VP8DSPContext *c)
VP8_BILINEAR_MC_FUNC(1, 8, ssse3); VP8_BILINEAR_MC_FUNC(1, 8, ssse3);
VP8_BILINEAR_MC_FUNC(2, 4, ssse3); VP8_BILINEAR_MC_FUNC(2, 4, ssse3);
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }
av_cold void ff_vp8dsp_init_x86(VP8DSPContext *c) av_cold void ff_vp8dsp_init_x86(VP8DSPContext *c)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMX(cpu_flags)) { if (EXTERNAL_MMX(cpu_flags)) {
@ -463,5 +463,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_filter16y = ff_vp8_h_loop_filter16y_mbedge_sse4;
c->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_mbedge_sse4; c->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_mbedge_sse4;
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

8
libavcodec/x86/vp9dsp_init.c
View File

@ -27,7 +27,7 @@
#include "libavcodec/vp9dsp.h" #include "libavcodec/vp9dsp.h"
#include "libavcodec/x86/vp9dsp_init.h" #include "libavcodec/x86/vp9dsp_init.h"
#if HAVE_YASM #if HAVE_X86ASM
decl_fpel_func(put, 4, , mmx); decl_fpel_func(put, 4, , mmx);
decl_fpel_func(put, 8, , mmx); decl_fpel_func(put, 8, , mmx);
@ -212,11 +212,11 @@ ipred_func(32, tm, avx2);
#undef ipred_dir_tm_funcs #undef ipred_dir_tm_funcs
#undef ipred_dc_funcs #undef ipred_dc_funcs
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp, int bpp, int bitexact) av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp, int bpp, int bitexact)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags; int cpu_flags;
if (bpp == 10) { if (bpp == 10) {
@ -412,5 +412,5 @@ av_cold void ff_vp9dsp_init_x86(VP9DSPContext *dsp, int bpp, int bitexact)
#undef init_subpel2 #undef init_subpel2
#undef init_subpel3 #undef init_subpel3
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

8
libavcodec/x86/vp9dsp_init_16bpp.c
View File

@ -27,7 +27,7 @@
#include "libavcodec/vp9dsp.h" #include "libavcodec/vp9dsp.h"
#include "libavcodec/x86/vp9dsp_init.h" #include "libavcodec/x86/vp9dsp_init.h"
#if HAVE_YASM #if HAVE_X86ASM
decl_fpel_func(put, 8, , mmx); decl_fpel_func(put, 8, , mmx);
decl_fpel_func(avg, 8, _16, mmxext); decl_fpel_func(avg, 8, _16, mmxext);
@ -66,11 +66,11 @@ decl_ipred_dir_funcs(vl);
decl_ipred_dir_funcs(vr); decl_ipred_dir_funcs(vr);
decl_ipred_dir_funcs(hu); decl_ipred_dir_funcs(hu);
decl_ipred_dir_funcs(hd); decl_ipred_dir_funcs(hd);
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
av_cold void ff_vp9dsp_init_16bpp_x86(VP9DSPContext *dsp) av_cold void ff_vp9dsp_init_16bpp_x86(VP9DSPContext *dsp)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMX(cpu_flags)) { if (EXTERNAL_MMX(cpu_flags)) {
@ -141,5 +141,5 @@ av_cold void ff_vp9dsp_init_16bpp_x86(VP9DSPContext *dsp)
init_ipred_func(dl, DIAG_DOWN_LEFT, 32, 16, avx2); init_ipred_func(dl, DIAG_DOWN_LEFT, 32, 16, avx2);
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

8
libavcodec/x86/vp9dsp_init_16bpp_template.c
View File

@ -27,7 +27,7 @@
#include "libavcodec/vp9dsp.h" #include "libavcodec/vp9dsp.h"
#include "libavcodec/x86/vp9dsp_init.h" #include "libavcodec/x86/vp9dsp_init.h"
#if HAVE_YASM #if HAVE_X86ASM
extern const int16_t ff_filters_16bpp[3][15][4][16]; extern const int16_t ff_filters_16bpp[3][15][4][16];
@ -137,11 +137,11 @@ decl_itxfm_func(iadst, iadst, 4, BPC, sse2);
decl_itxfm_funcs(8, BPC, sse2); decl_itxfm_funcs(8, BPC, sse2);
decl_itxfm_funcs(16, BPC, sse2); decl_itxfm_funcs(16, BPC, sse2);
decl_itxfm_func(idct, idct, 32, BPC, sse2); decl_itxfm_func(idct, idct, 32, BPC, sse2);
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
av_cold void INIT_FUNC(VP9DSPContext *dsp, int bitexact) av_cold void INIT_FUNC(VP9DSPContext *dsp, int bitexact)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
#define init_lpf_8_func(idx1, idx2, dir, wd, bpp, opt) \ #define init_lpf_8_func(idx1, idx2, dir, wd, bpp, opt) \
@ -234,7 +234,7 @@ av_cold void INIT_FUNC(VP9DSPContext *dsp, int bitexact)
#endif #endif
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
ff_vp9dsp_init_16bpp_x86(dsp); ff_vp9dsp_init_16bpp_x86(dsp);
} }

6
libavcodec/x86/xvididct_init.c
View File

@ -26,7 +26,7 @@
#include "idctdsp.h" #include "idctdsp.h"
#include "xvididct.h" #include "xvididct.h"
#if ARCH_X86_32 && HAVE_YASM #if ARCH_X86_32 && HAVE_X86ASM
static void xvid_idct_mmx_put(uint8_t *dest, ptrdiff_t line_size, short *block) static void xvid_idct_mmx_put(uint8_t *dest, ptrdiff_t line_size, short *block)
{ {
ff_xvid_idct_mmx(block); ff_xvid_idct_mmx(block);
@ -55,7 +55,7 @@ static void xvid_idct_mmxext_add(uint8_t *dest, ptrdiff_t line_size, short *bloc
av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c, AVCodecContext *avctx,
unsigned high_bit_depth) unsigned high_bit_depth)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (high_bit_depth || if (high_bit_depth ||
@ -85,5 +85,5 @@ av_cold void ff_xvid_idct_init_x86(IDCTDSPContext *c, AVCodecContext *avctx,
c->idct = ff_xvid_idct_sse2; c->idct = ff_xvid_idct_sse2;
c->perm_type = FF_IDCT_PERM_SSE2; c->perm_type = FF_IDCT_PERM_SSE2;
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

44
libavfilter/x86/Makefile
View File

@ -24,27 +24,27 @@ OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume_init.o
OBJS-$(CONFIG_W3FDIF_FILTER) += x86/vf_w3fdif_init.o OBJS-$(CONFIG_W3FDIF_FILTER) += x86/vf_w3fdif_init.o
OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif_init.o OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif_init.o
YASM-OBJS-$(CONFIG_AFIR_FILTER) += x86/af_afir.o X86ASM-OBJS-$(CONFIG_AFIR_FILTER) += x86/af_afir.o
YASM-OBJS-$(CONFIG_BLEND_FILTER) += x86/vf_blend.o X86ASM-OBJS-$(CONFIG_BLEND_FILTER) += x86/vf_blend.o
YASM-OBJS-$(CONFIG_BWDIF_FILTER) += x86/vf_bwdif.o X86ASM-OBJS-$(CONFIG_BWDIF_FILTER) += x86/vf_bwdif.o
YASM-OBJS-$(CONFIG_COLORSPACE_FILTER) += x86/colorspacedsp.o X86ASM-OBJS-$(CONFIG_COLORSPACE_FILTER) += x86/colorspacedsp.o
YASM-OBJS-$(CONFIG_FSPP_FILTER) += x86/vf_fspp.o X86ASM-OBJS-$(CONFIG_FSPP_FILTER) += x86/vf_fspp.o
YASM-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o X86ASM-OBJS-$(CONFIG_GRADFUN_FILTER) += x86/vf_gradfun.o
YASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d.o X86ASM-OBJS-$(CONFIG_HQDN3D_FILTER) += x86/vf_hqdn3d.o
YASM-OBJS-$(CONFIG_IDET_FILTER) += x86/vf_idet.o X86ASM-OBJS-$(CONFIG_IDET_FILTER) += x86/vf_idet.o
YASM-OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace.o X86ASM-OBJS-$(CONFIG_INTERLACE_FILTER) += x86/vf_interlace.o
YASM-OBJS-$(CONFIG_MASKEDMERGE_FILTER) += x86/vf_maskedmerge.o X86ASM-OBJS-$(CONFIG_MASKEDMERGE_FILTER) += x86/vf_maskedmerge.o
YASM-OBJS-$(CONFIG_PP7_FILTER) += x86/vf_pp7.o X86ASM-OBJS-$(CONFIG_PP7_FILTER) += x86/vf_pp7.o
YASM-OBJS-$(CONFIG_PSNR_FILTER) += x86/vf_psnr.o X86ASM-OBJS-$(CONFIG_PSNR_FILTER) += x86/vf_psnr.o
YASM-OBJS-$(CONFIG_PULLUP_FILTER) += x86/vf_pullup.o X86ASM-OBJS-$(CONFIG_PULLUP_FILTER) += x86/vf_pullup.o
ifdef CONFIG_GPL ifdef CONFIG_GPL
YASM-OBJS-$(CONFIG_REMOVEGRAIN_FILTER) += x86/vf_removegrain.o X86ASM-OBJS-$(CONFIG_REMOVEGRAIN_FILTER) += x86/vf_removegrain.o
endif endif
YASM-OBJS-$(CONFIG_SHOWCQT_FILTER) += x86/avf_showcqt.o X86ASM-OBJS-$(CONFIG_SHOWCQT_FILTER) += x86/avf_showcqt.o
YASM-OBJS-$(CONFIG_SSIM_FILTER) += x86/vf_ssim.o X86ASM-OBJS-$(CONFIG_SSIM_FILTER) += x86/vf_ssim.o
YASM-OBJS-$(CONFIG_STEREO3D_FILTER) += x86/vf_stereo3d.o X86ASM-OBJS-$(CONFIG_STEREO3D_FILTER) += x86/vf_stereo3d.o
YASM-OBJS-$(CONFIG_TBLEND_FILTER) += x86/vf_blend.o X86ASM-OBJS-$(CONFIG_TBLEND_FILTER) += x86/vf_blend.o
YASM-OBJS-$(CONFIG_TINTERLACE_FILTER) += x86/vf_interlace.o X86ASM-OBJS-$(CONFIG_TINTERLACE_FILTER) += x86/vf_interlace.o
YASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o X86ASM-OBJS-$(CONFIG_VOLUME_FILTER) += x86/af_volume.o
YASM-OBJS-$(CONFIG_W3FDIF_FILTER) += x86/vf_w3fdif.o X86ASM-OBJS-$(CONFIG_W3FDIF_FILTER) += x86/vf_w3fdif.o
YASM-OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif.o x86/yadif-16.o x86/yadif-10.o X86ASM-OBJS-$(CONFIG_YADIF_FILTER) += x86/vf_yadif.o x86/yadif-16.o x86/yadif-10.o

8
libavfilter/x86/vf_gradfun_init.c
View File

@ -39,7 +39,7 @@ void ff_gradfun_blur_line_movdqu_sse2(intptr_t x, uint16_t *buf,
const uint16_t *buf1, uint16_t *dc, const uint16_t *buf1, uint16_t *dc,
const uint8_t *src1, const uint8_t *src2); const uint8_t *src1, const uint8_t *src2);
#if HAVE_YASM #if HAVE_X86ASM
static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src, static void gradfun_filter_line_mmxext(uint8_t *dst, const uint8_t *src,
const uint16_t *dc, const uint16_t *dc,
int width, int thresh, int width, int thresh,
@ -87,11 +87,11 @@ static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, const uint16_t *
dc + width, src + width * 2, dc + width, src + width * 2,
src + width * 2 + src_linesize); src + width * 2 + src_linesize);
} }
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
av_cold void ff_gradfun_init_x86(GradFunContext *gf) av_cold void ff_gradfun_init_x86(GradFunContext *gf)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMXEXT(cpu_flags)) if (EXTERNAL_MMXEXT(cpu_flags))
@ -101,5 +101,5 @@ av_cold void ff_gradfun_init_x86(GradFunContext *gf)
if (EXTERNAL_SSE2(cpu_flags)) if (EXTERNAL_SSE2(cpu_flags))
gf->blur_line = gradfun_blur_line_sse2; gf->blur_line = gradfun_blur_line_sse2;
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

4
libavfilter/x86/vf_hqdn3d_init.c
View File

@ -40,10 +40,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) 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[8] = ff_hqdn3d_row_8_x86;
hqdn3d->denoise_row[9] = ff_hqdn3d_row_9_x86; hqdn3d->denoise_row[9] = ff_hqdn3d_row_9_x86;
hqdn3d->denoise_row[10] = ff_hqdn3d_row_10_x86; hqdn3d->denoise_row[10] = ff_hqdn3d_row_10_x86;
hqdn3d->denoise_row[16] = ff_hqdn3d_row_16_x86; hqdn3d->denoise_row[16] = ff_hqdn3d_row_16_x86;
#endif /* HAVE_YASM */ #endif /* HAVE_X86ASM */
} }

6
libavfilter/x86/vf_idet_init.c
View File

@ -23,7 +23,7 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavfilter/vf_idet.h" #include "libavfilter/vf_idet.h"
#if HAVE_YASM #if HAVE_X86ASM
/* declares main callable idet_filter_line_{mmx,mmxext,sse2}() */ /* declares main callable idet_filter_line_{mmx,mmxext,sse2}() */
#define FUNC_MAIN_DECL(KIND, SPAN) \ #define FUNC_MAIN_DECL(KIND, SPAN) \
@ -68,7 +68,7 @@ FUNC_MAIN_DECL_16bit(mmx, 4)
#endif #endif
av_cold void ff_idet_init_x86(IDETContext *idet, int for_16b) av_cold void ff_idet_init_x86(IDETContext *idet, int for_16b)
{ {
#if HAVE_YASM #if HAVE_X86ASM
const int cpu_flags = av_get_cpu_flags(); const int cpu_flags = av_get_cpu_flags();
#if ARCH_X86_32 #if ARCH_X86_32
@ -83,5 +83,5 @@ av_cold void ff_idet_init_x86(IDETContext *idet, int for_16b)
if (EXTERNAL_SSE2(cpu_flags)) { if (EXTERNAL_SSE2(cpu_flags)) {
idet->filter_line = for_16b ? (ff_idet_filter_func)idet_filter_line_16bit_sse2 : idet_filter_line_sse2; idet->filter_line = for_16b ? (ff_idet_filter_func)idet_filter_line_16bit_sse2 : idet_filter_line_sse2;
} }
#endif // HAVE_YASM #endif // HAVE_X86ASM
} }

2
libavfilter/x86/vf_pullup_init.c
View File

@ -29,7 +29,7 @@ int ff_pullup_filter_var_mmx (const uint8_t *a, const uint8_t *b, ptrdiff_t s);
av_cold void ff_pullup_init_x86(PullupContext *s) av_cold void ff_pullup_init_x86(PullupContext *s)
{ {
#if HAVE_YASM #if HAVE_X86ASM
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (EXTERNAL_MMX(cpu_flags)) { if (EXTERNAL_MMX(cpu_flags)) {

2
libavresample/x86/Makefile
View File

@ -4,6 +4,6 @@ OBJS += x86/audio_convert_init.o \
OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
YASM-OBJS += x86/audio_convert.o \ X86ASM-OBJS += x86/audio_convert.o \
x86/audio_mix.o \ x86/audio_mix.o \
x86/dither.o \ x86/dither.o \

4
libavutil/x86/Makefile
View File

@ -8,11 +8,11 @@ OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o \
EMMS_OBJS_$(HAVE_MMX_INLINE)_$(HAVE_MMX_EXTERNAL)_$(HAVE_MM_EMPTY) = x86/emms.o EMMS_OBJS_$(HAVE_MMX_INLINE)_$(HAVE_MMX_EXTERNAL)_$(HAVE_MM_EMPTY) = x86/emms.o
YASM-OBJS += x86/cpuid.o \ X86ASM-OBJS += x86/cpuid.o \
$(EMMS_OBJS__yes_) \ $(EMMS_OBJS__yes_) \
x86/fixed_dsp.o \ x86/fixed_dsp.o \
x86/float_dsp.o \ x86/float_dsp.o \
x86/imgutils.o \ x86/imgutils.o \
x86/lls.o \ x86/lls.o \
YASM-OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils.o \ X86ASM-OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils.o \

4
libavutil/x86/cpu.c
View File

@ -28,7 +28,7 @@
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/cpu_internal.h" #include "libavutil/cpu_internal.h"
#if HAVE_YASM #if HAVE_X86ASM
#define cpuid(index, eax, ebx, ecx, edx) \ #define cpuid(index, eax, ebx, ecx, edx) \
ff_cpu_cpuid(index, &eax, &ebx, &ecx, &edx) ff_cpu_cpuid(index, &eax, &ebx, &ecx, &edx)
@ -66,7 +66,7 @@
#define cpuid_test() 1 #define cpuid_test() 1
#elif HAVE_YASM #elif HAVE_X86ASM
#define cpuid_test ff_cpu_cpuid_test #define cpuid_test ff_cpu_cpuid_test

2
libswresample/audioconvert.c
View File

@ -176,7 +176,7 @@ AudioConvert *swri_audio_convert_alloc(enum AVSampleFormat out_fmt,
} }
} }
if(HAVE_YASM && HAVE_MMX) swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels); if(HAVE_X86ASM && HAVE_MMX) swri_audio_convert_init_x86(ctx, out_fmt, in_fmt, channels);
if(ARCH_ARM) swri_audio_convert_init_arm(ctx, out_fmt, in_fmt, channels); if(ARCH_ARM) swri_audio_convert_init_arm(ctx, out_fmt, in_fmt, channels);
if(ARCH_AARCH64) swri_audio_convert_init_aarch64(ctx, out_fmt, in_fmt, channels); if(ARCH_AARCH64) swri_audio_convert_init_aarch64(ctx, out_fmt, in_fmt, channels);

2
libswresample/rematrix.c
View File

@ -470,7 +470,7 @@ av_cold int swri_rematrix_init(SwrContext *s){
s->matrix_ch[i][0]= ch_in; s->matrix_ch[i][0]= ch_in;
} }
if(HAVE_YASM && HAVE_MMX) if(HAVE_X86ASM && HAVE_MMX)
return swri_rematrix_init_x86(s); return swri_rematrix_init_x86(s);
return 0; return 0;

2
libswresample/x86/Makefile
View File

@ -1,4 +1,4 @@
YASM-OBJS += x86/audio_convert.o\ X86ASM-OBJS += x86/audio_convert.o\
x86/rematrix.o\ x86/rematrix.o\
x86/resample.o\ x86/resample.o\

2
libswresample/x86/rematrix_init.c
View File

@ -31,7 +31,7 @@ D(int16, mmx)
D(int16, sse2) D(int16, sse2)
av_cold int swri_rematrix_init_x86(struct SwrContext *s){ av_cold int swri_rematrix_init_x86(struct SwrContext *s){
#if HAVE_YASM #if HAVE_X86ASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
int nb_in = av_get_channel_layout_nb_channels(s->in_ch_layout); int nb_in = av_get_channel_layout_nb_channels(s->in_ch_layout);
int nb_out = av_get_channel_layout_nb_channels(s->out_ch_layout); int nb_out = av_get_channel_layout_nb_channels(s->out_ch_layout);

2
libswscale/x86/Makefile
View File

@ -8,6 +8,6 @@ MMX-OBJS += x86/hscale_fast_bilinear_simd.o \
OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
YASM-OBJS += x86/input.o \ X86ASM-OBJS += x86/input.o \
x86/output.o \ x86/output.o \
x86/scale.o \ x86/scale.o \

4
libswscale/x86/rgb2rgb_template.c
View File

@ -1961,7 +1961,7 @@ static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2, ui
#endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */ #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */
#if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL #if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL
#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, void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV,
const uint8_t *unused, const uint8_t *unused,
const uint8_t *src1, const uint8_t *src1,
@ -2601,7 +2601,7 @@ static av_cold void RENAME(rgb2rgb_init)(void)
interleaveBytes = RENAME(interleaveBytes); interleaveBytes = RENAME(interleaveBytes);
#endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */ #endif /* !COMPILE_TEMPLATE_AMD3DNOW && !COMPILE_TEMPLATE_AVX */
#if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL #if !COMPILE_TEMPLATE_AVX || HAVE_AVX_EXTERNAL
#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); deinterleaveBytes = RENAME(deinterleaveBytes);
#endif #endif
#endif #endif

2
tests/checkasm/Makefile
View File

@ -36,7 +36,7 @@ CHECKASMOBJS-$(CONFIG_AVUTIL) += $(AVUTILOBJS)
CHECKASMOBJS-$(ARCH_AARCH64) += aarch64/checkasm.o CHECKASMOBJS-$(ARCH_AARCH64) += aarch64/checkasm.o
CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/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 += $(CHECKASMOBJS-yes) checkasm.o
CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%)) CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%))

2
tests/checkasm/checkasm.h
View File

@ -100,7 +100,7 @@ static av_unused void *func_ref, *func_new;
/* Call the reference function */ /* Call the reference function */
#define call_ref(...) ((func_type *)func_ref)(__VA_ARGS__) #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 /* Verifies that clobbered callee-saved registers are properly saved and restored
* and that either no MMX registers are touched or emms is issued */ * and that either no MMX registers are touched or emms is issued */
void checkasm_checked_call(void *func, ...); void checkasm_checked_call(void *func, ...);

2
tools/target_dec_fuzzer.c
View File

@ -25,7 +25,7 @@
svn co http://llvm.org/svn/llvm-project/llvm/trunk/lib/Fuzzer svn co http://llvm.org/svn/llvm-project/llvm/trunk/lib/Fuzzer
./Fuzzer/build.sh ./Fuzzer/build.sh
* build ffmpeg for fuzzing: * build ffmpeg for fuzzing:
FLAGS="-fsanitize=address -fsanitize-coverage=trace-pc-guard,trace-cmp -g" CC="clang $FLAGS" CXX="clang++ $FLAGS" ./configure --disable-yasm FLAGS="-fsanitize=address -fsanitize-coverage=trace-pc-guard,trace-cmp -g" CC="clang $FLAGS" CXX="clang++ $FLAGS" ./configure --disable-x86asm
make clean && make -j make clean && make -j
* build the fuzz target. * build the fuzz target.
Choose the value of FFMPEG_CODEC (e.g. AV_CODEC_ID_DVD_SUBTITLE) and Choose the value of FFMPEG_CODEC (e.g. AV_CODEC_ID_DVD_SUBTITLE) and