Also rename related init macros to simplify addition of new IDCT code. --- The new file takes a lot of time to assemble, so this helps keep total compilation time bearable...
libavcodec/x86/Makefile | 2 +- libavcodec/x86/{hevc_idct.asm => hevc_idct_dc.asm} | 2 +- libavcodec/x86/hevcdsp_init.c | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) rename libavcodec/x86/{hevc_idct.asm => hevc_idct_dc.asm} (98%) diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index a38535b..b995316 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -117,7 +117,7 @@ YASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o YASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o YASM-OBJS-$(CONFIG_HEVC_DECODER) += x86/hevc_deblock.o \ x86/hevc_mc.o \ - x86/hevc_idct.o + x86/hevc_idct_dc.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 diff --git a/libavcodec/x86/hevc_idct.asm b/libavcodec/x86/hevc_idct_dc.asm similarity index 98% rename from libavcodec/x86/hevc_idct.asm rename to libavcodec/x86/hevc_idct_dc.asm index 71e4607..888c921 100644 --- a/libavcodec/x86/hevc_idct.asm +++ b/libavcodec/x86/hevc_idct_dc.asm @@ -1,5 +1,5 @@ ;******************************************************************************* -;* SIMD-optimized IDCT functions for HEVC decoding +;* SIMD-optimized IDCT DC functions for HEVC decoding ;* Copyright (c) 2014 Pierre-Edouard LEPERE ;* Copyright (c) 2014 James Almer ;* diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c index 1a675ab..dcfbb02 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -66,17 +66,17 @@ idct_dc_proto(32,10, avx); idct_dc_proto(16,10, avx2); idct_dc_proto(32,10, avx2); -#define IDCT_FUNCS(W, opt) \ +#define IDCT_DC_FUNCS(W, opt) \ void ff_hevc_idct_ ## W ## _dc_8_ ## opt(int16_t *coeffs); \ void ff_hevc_idct_ ## W ## _dc_10_ ## opt(int16_t *coeffs) -IDCT_FUNCS(4x4, mmxext); -IDCT_FUNCS(8x8, mmxext); -IDCT_FUNCS(8x8, sse2); -IDCT_FUNCS(16x16, sse2); -IDCT_FUNCS(32x32, sse2); -IDCT_FUNCS(16x16, avx2); -IDCT_FUNCS(32x32, avx2); +IDCT_DC_FUNCS(4x4, mmxext); +IDCT_DC_FUNCS(8x8, mmxext); +IDCT_DC_FUNCS(8x8, sse2); +IDCT_DC_FUNCS(16x16, sse2); +IDCT_DC_FUNCS(32x32, sse2); +IDCT_DC_FUNCS(16x16, avx2); +IDCT_DC_FUNCS(32x32, avx2); #define GET_PIXELS(width, depth, cf) \ void ff_hevc_get_pixels_ ## width ## _ ## depth ## _ ## cf(int16_t *dst, ptrdiff_t dststride, \ -- 2.7.3 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel