[SCM] libav/experimental: DNxHD: convert inline asm to yasm
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:02:46 UTC 2014
The following commit has been merged in the experimental branch:
commit 71c32ed5335add04cbe44896f4b3d748b9b1153c
Author: Timothy Gu <timothygu99 at gmail.com>
Date: Fri Mar 28 02:37:51 2014 +0100
DNxHD: convert inline asm to yasm
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 910471a..8da5a91 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -26,7 +26,7 @@ OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o
OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o
OBJS-$(CONFIG_DCA_DECODER) += x86/dcadsp_init.o
-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o
+OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc_init.o
OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o
OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o
OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o
@@ -56,6 +56,7 @@ YASM-OBJS += x86/deinterlace.o \
YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o
YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o
+YASM-OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o
YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o \
x86/fpel.o \
x86/mpeg4qpel.o \
diff --git a/libavcodec/x86/dnxhdenc.asm b/libavcodec/x86/dnxhdenc.asm
new file mode 100644
index 0000000..d39b07b
--- /dev/null
+++ b/libavcodec/x86/dnxhdenc.asm
@@ -0,0 +1,49 @@
+;************************************************************************
+;* VC3/DNxHD SIMD functions
+;* Copyright (c) 2007 Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>
+;* Copyright (c) 2014 Tiancheng "Timothy" Gu <timothygu99 at gmail.com>
+;*
+;* This file is part of Libav.
+;*
+;* Libav 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.
+;*
+;* Libav 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 Libav; if not, write to the Free Software
+;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+section .text
+
+; void get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels,
+; ptrdiff_t line_size)
+INIT_XMM sse2
+cglobal get_pixels_8x4_sym, 3,3,5, block, pixels, linesize
+ pxor m4, m4
+ movq m0, [pixelsq]
+ add pixelsq, linesizeq
+ movq m1, [pixelsq]
+ movq m2, [pixelsq+linesizeq]
+ movq m3, [pixelsq+linesizeq*2]
+ punpcklbw m0, m4
+ punpcklbw m1, m4
+ punpcklbw m2, m4
+ punpcklbw m3, m4
+ mova [blockq ], m0
+ mova [blockq+16 ], m1
+ mova [blockq+32 ], m2
+ mova [blockq+48 ], m3
+ mova [blockq+64 ], m3
+ mova [blockq+80 ], m2
+ mova [blockq+96 ], m1
+ mova [blockq+112], m0
+ RET
diff --git a/libavcodec/x86/dnxhdenc.c b/libavcodec/x86/dnxhdenc.c
deleted file mode 100644
index 26b715c..0000000
--- a/libavcodec/x86/dnxhdenc.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * VC3/DNxHD SIMD functions
- * Copyright (c) 2007 Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>
- *
- * VC-3 encoder funded by the British Broadcasting Corporation
- *
- * This file is part of Libav.
- *
- * Libav 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.
- *
- * Libav 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 Libav; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "libavutil/attributes.h"
-#include "libavutil/x86/asm.h"
-#include "libavutil/x86/cpu.h"
-#include "libavcodec/dnxhdenc.h"
-
-#if HAVE_SSE2_INLINE
-
-static void get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size)
-{
- __asm__ volatile(
- "pxor %%xmm5, %%xmm5 \n\t"
- "movq (%0), %%xmm0 \n\t"
- "add %2, %0 \n\t"
- "movq (%0), %%xmm1 \n\t"
- "movq (%0, %2), %%xmm2 \n\t"
- "movq (%0, %2,2), %%xmm3 \n\t"
- "punpcklbw %%xmm5, %%xmm0 \n\t"
- "punpcklbw %%xmm5, %%xmm1 \n\t"
- "punpcklbw %%xmm5, %%xmm2 \n\t"
- "punpcklbw %%xmm5, %%xmm3 \n\t"
- "movdqa %%xmm0, (%1) \n\t"
- "movdqa %%xmm1, 16(%1) \n\t"
- "movdqa %%xmm2, 32(%1) \n\t"
- "movdqa %%xmm3, 48(%1) \n\t"
- "movdqa %%xmm3 , 64(%1) \n\t"
- "movdqa %%xmm2 , 80(%1) \n\t"
- "movdqa %%xmm1 , 96(%1) \n\t"
- "movdqa %%xmm0, 112(%1) \n\t"
- : "+r" (pixels)
- : "r" (block), "r" ((x86_reg)line_size)
- );
-}
-
-#endif /* HAVE_SSE2_INLINE */
-
-av_cold void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx)
-{
-#if HAVE_SSE2_INLINE
- if (INLINE_SSE2(av_get_cpu_flags())) {
- if (ctx->cid_table->bit_depth == 8)
- ctx->get_pixels_8x4_sym = get_pixels_8x4_sym_sse2;
- }
-#endif /* HAVE_SSE2_INLINE */
-}
diff --git a/libavcodec/x86/h263dsp_init.c b/libavcodec/x86/dnxhdenc_init.c
similarity index 58%
copy from libavcodec/x86/h263dsp_init.c
copy to libavcodec/x86/dnxhdenc_init.c
index d4fab98..0f8a1e4 100644
--- a/libavcodec/x86/h263dsp_init.c
+++ b/libavcodec/x86/dnxhdenc_init.c
@@ -1,5 +1,8 @@
/*
- * Copyright (c) 2013 Diego Biurrun <diego at biurrun.de>
+ * VC3/DNxHD SIMD functions
+ * Copyright (c) 2007 Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>
+ *
+ * VC-3 encoder funded by the British Broadcasting Corporation
*
* This file is part of Libav.
*
@@ -18,22 +21,19 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <stdint.h>
-
#include "libavutil/attributes.h"
-#include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h"
-#include "libavcodec/h263dsp.h"
+#include "libavcodec/dnxhdenc.h"
-void ff_h263_h_loop_filter_mmx(uint8_t *src, int stride, int qscale);
-void ff_h263_v_loop_filter_mmx(uint8_t *src, int stride, int qscale);
+void ff_get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels,
+ ptrdiff_t line_size);
-av_cold void ff_h263dsp_init_x86(H263DSPContext *c)
+av_cold void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx)
{
- int cpu_flags = av_get_cpu_flags();
-
- if (EXTERNAL_MMX(cpu_flags)) {
- c->h263_h_loop_filter = ff_h263_h_loop_filter_mmx;
- c->h263_v_loop_filter = ff_h263_v_loop_filter_mmx;
+#if HAVE_SSE2_EXTERNAL
+ if (EXTERNAL_SSE2(av_get_cpu_flags())) {
+ if (ctx->cid_table->bit_depth == 8)
+ ctx->get_pixels_8x4_sym = ff_get_pixels_8x4_sym_sse2;
}
+#endif /* HAVE_SSE2_EXTERNAL */
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list