On Sun, Feb 15, 2015 at 11:45:19PM -0300, James Almer wrote:
> Signed-off-by: James Almer <jamr...@gmail.com>
> ---
> libavcodec/g722dsp.c | 2 ++
> libavcodec/g722dsp.h | 1 +
> libavcodec/x86/Makefile | 4 ++++
> libavcodec/x86/g722dsp.asm | 54
> +++++++++++++++++++++++++++++++++++++++++++
> libavcodec/x86/g722dsp_init.c | 35 ++++++++++++++++++++++++++++
> 5 files changed, 96 insertions(+)
> create mode 100644 libavcodec/x86/g722dsp.asm
> create mode 100644 libavcodec/x86/g722dsp_init.c
>
> diff --git a/libavcodec/g722dsp.c b/libavcodec/g722dsp.c
> index 051f891..f148053 100644
> --- a/libavcodec/g722dsp.c
> +++ b/libavcodec/g722dsp.c
> @@ -71,4 +71,6 @@ av_cold void ff_g722dsp_init(G722DSPContext *c)
>
> if (ARCH_ARM)
> ff_g722dsp_init_arm(c);
> + if (ARCH_X86)
> + ff_g722dsp_init_x86(c);
> }
> diff --git a/libavcodec/g722dsp.h b/libavcodec/g722dsp.h
> index cab4a5f..c956a1e 100644
> --- a/libavcodec/g722dsp.h
> +++ b/libavcodec/g722dsp.h
> @@ -29,5 +29,6 @@ typedef struct G722DSPContext {
>
> void ff_g722dsp_init(G722DSPContext *c);
> void ff_g722dsp_init_arm(G722DSPContext *c);
> +void ff_g722dsp_init_x86(G722DSPContext *c);
>
> #endif /* AVCODEC_G722DSP_H */
> diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
> index 00dacda..7c4f4cd 100644
> --- a/libavcodec/x86/Makefile
> +++ b/libavcodec/x86/Makefile
> @@ -37,6 +37,8 @@ OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
>
> # decoders/encoders
> OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
> +OBJS-$(CONFIG_ADPCM_G722_DECODER) += x86/g722dsp_init.o
> +OBJS-$(CONFIG_ADPCM_G722_ENCODER) += x86/g722dsp_init.o
> OBJS-$(CONFIG_APNG_DECODER) += x86/pngdsp_init.o
> OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o
> OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp_init.o
> @@ -129,6 +131,8 @@ YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
>
> # decoders/encoders
> YASM-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp.o
> +YASM-OBJS-$(CONFIG_ADPCM_G722_DECODER) += x86/g722dsp.o
> +YASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += x86/g722dsp.o
> YASM-OBJS-$(CONFIG_APNG_DECODER) += x86/pngdsp.o
> YASM-OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp.o
> YASM-OBJS-$(CONFIG_HEVC_DECODER) += x86/hevc_mc.o \
> diff --git a/libavcodec/x86/g722dsp.asm b/libavcodec/x86/g722dsp.asm
> new file mode 100644
> index 0000000..f43c476
> --- /dev/null
> +++ b/libavcodec/x86/g722dsp.asm
> @@ -0,0 +1,54 @@
> +;******************************************************************************
> +;* SIMD optimized DSP functions for G722 coding
> +;*
> +;* Copyright (c) 2014 James Almer
> +;*
> +;* This file is part of FFmpeg.
> +;*
> +;* FFmpeg is free software; you can redistribute it and/or
> +;* modify it under the terms of the GNU Lesser General Public
> +;* License as published by the Free Software Foundation; either
> +;* version 2.1 of the License, or (at your option) any later version.
> +;*
> +;* FFmpeg is distributed in the hope that it will be useful,
> +;* but WITHOUT ANY WARRANTY; without even the implied warranty of
> +;* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +;* Lesser General Public License for more details.
> +;*
> +;* You should have received a copy of the GNU Lesser General Public
> +;* License along with FFmpeg; if not, write to the Free Software
> +;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> +;******************************************************************************
> +
> +%include "libavutil/x86/x86util.asm"
> +
> +SECTION_RODATA
> +
> +pw_qmf_coeffs: dw 3, -210, -11, -805, -11, 951, 53, 3876
> +pw_qmf_coeffs2: dw 12, 3876, -156, 951, 32, -805, 362, -210
> +pw_qmf_coeffs3: dw 362, 0 , 32, 0, -156, 0, 12, 0
> +pw_qmf_coeffs4: dw 53, 0, -11, 0, -11, 0, 3, 0
> +
> +SECTION_TEXT
> +
> +INIT_XMM sse2
> +cglobal g722_apply_qmf, 2, 2, 5, prev, out
> + movu m0, [prevq+mmsize*0]
> + movu m1, [prevq+mmsize*1]
> + movu m2, [prevq+mmsize*2]
> + punpcklwd m3, m0, m1
> + punpckhwd m0, m1
> + punpcklwd m4, m2, m2
> + punpckhwd m2, m2
> + pmaddwd m3, [pw_qmf_coeffs ]
> + pmaddwd m0, [pw_qmf_coeffs2]
> + pmaddwd m4, [pw_qmf_coeffs3]
> + pmaddwd m2, [pw_qmf_coeffs4]
> + paddd m0, m3
> + paddd m2, m4
> + paddd m0, m2
> + pshufd m2, m0, q0032
> + paddd m0, m2
> + pshufd m0, m0, q0001
> + movq [outq], m0
> + RETLGTM though i suspect the call overhead on this may be "significant" but i guess g722 on a x86 isnt enough of a bottleneck to be worth trying to avoid that [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
