[FFmpeg-devel] [PATCH 4/9] x86: simple_idct_put: 10bits versions
Christophe Gisquet
christophe.gisquet at gmail.com
Sun Oct 11 16:06:08 CEST 2015
Modeled from the prores version. Clips to [0;1023] and is bitexact.
Bitexactness requires to add an offset in a different place compared
to prores or C, and makes the function approximately 2% slower.
For 16 frames of a DNxHD 4:2:2 10bits test sequence:
C: 60861 decicycles in idct, 1048205 runs, 371 skips
sse2: 27567 decicycles in idct, 1048216 runs, 360 skips
avx: 26272 decicycles in idct, 1048171 runs, 405 skips
The pure and _add versions are not implemented, so the corresponding
dsp functions are set to NULL to make it clear in a code executing
them.
---
libavcodec/x86/Makefile | 1 +
libavcodec/x86/idctdsp_init.c | 20 ++++++++++++
libavcodec/x86/simple_idct.h | 3 ++
libavcodec/x86/simple_idct10.asm | 53 +++++++++++++++++++++++++++++++
libavcodec/x86/simple_idct10_template.asm | 12 +++++++
5 files changed, 89 insertions(+)
create mode 100644 libavcodec/x86/simple_idct10.asm
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index a9d8032..ef7628e 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -126,6 +126,7 @@ YASM-OBJS-$(CONFIG_QPELDSP) += x86/qpeldsp.o \
x86/fpel.o \
x86/qpel.o
YASM-OBJS-$(CONFIG_RV34DSP) += x86/rv34dsp.o
+YASM-OBJS-$(CONFIG_IDCTDSP) += x86/simple_idct10.o
YASM-OBJS-$(CONFIG_VIDEODSP) += x86/videodsp.o
YASM-OBJS-$(CONFIG_VP3DSP) += x86/vp3dsp.o
YASM-OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp.o \
diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c
index 2c26a98..f6d2b50 100644
--- a/libavcodec/x86/idctdsp_init.c
+++ b/libavcodec/x86/idctdsp_init.c
@@ -85,4 +85,24 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx,
c->put_pixels_clamped = ff_put_pixels_clamped_sse2;
c->add_pixels_clamped = ff_add_pixels_clamped_sse2;
}
+
+ if (ARCH_X86_64 &&
+ avctx->bits_per_raw_sample == 10 && avctx->lowres == 0 &&
+ (avctx->idct_algo == FF_IDCT_AUTO ||
+ avctx->idct_algo == FF_IDCT_SIMPLEAUTO ||
+ avctx->idct_algo == FF_IDCT_SIMPLE)) {
+ if (EXTERNAL_SSE2(cpu_flags)) {
+ c->idct_put = ff_simple_idct10_put_sse2;
+ c->idct_add = NULL;
+ c->idct = NULL;
+ c->perm_type = FF_IDCT_PERM_TRANSPOSE;
+
+ }
+ if (EXTERNAL_AVX(cpu_flags)) {
+ c->idct_put = ff_simple_idct10_put_avx;
+ c->idct_add = NULL;
+ c->idct = NULL;
+ c->perm_type = FF_IDCT_PERM_TRANSPOSE;
+ }
+ }
}
diff --git a/libavcodec/x86/simple_idct.h b/libavcodec/x86/simple_idct.h
index 4a98732..d886434 100644
--- a/libavcodec/x86/simple_idct.h
+++ b/libavcodec/x86/simple_idct.h
@@ -25,4 +25,7 @@ void ff_simple_idct_mmx(int16_t *block);
void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block);
void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block);
+void ff_simple_idct10_put_sse2(uint8_t *dest, int line_size, int16_t *block);
+void ff_simple_idct10_put_avx(uint8_t *dest, int line_size, int16_t *block);
+
#endif /* AVCODEC_X86_SIMPLE_IDCT_H */
diff --git a/libavcodec/x86/simple_idct10.asm b/libavcodec/x86/simple_idct10.asm
new file mode 100644
index 0000000..982fb1e
--- /dev/null
+++ b/libavcodec/x86/simple_idct10.asm
@@ -0,0 +1,53 @@
+;******************************************************************************
+;* x86-SIMD-optimized IDCT for prores
+;* this is identical to "simple" IDCT written by Michael Niedermayer
+;* except for the clip range
+;*
+;* Copyright (c) 2011 Ronald S. Bultje <rsbultje at gmail.com>
+;* Copyright (c) 2015 Christophe Gisquet
+;*
+;* 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
+;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+;******************************************************************************
+
+%include "libavutil/x86/x86util.asm"
+
+%if ARCH_X86_64
+
+SECTION_RODATA
+
+cextern pw_16
+cextern pw_1023
+pd_round: times 4 dd 1<<(12-1)
+
+%include "libavcodec/x86/simple_idct10_template.asm"
+
+section .text align=16
+
+%macro idct_put_fn 1
+cglobal simple_idct10_put, 3, 3, %1
+ IDCT_PUT_FN "", 12, pw_16, 19, 0, pw_1023
+ RET
+%endmacro
+
+INIT_XMM sse2
+idct_put_fn 16
+%if HAVE_AVX_EXTERNAL
+INIT_XMM avx
+idct_put_fn 16
+%endif
+
+%endif
diff --git a/libavcodec/x86/simple_idct10_template.asm b/libavcodec/x86/simple_idct10_template.asm
index 968d280..86c2765 100644
--- a/libavcodec/x86/simple_idct10_template.asm
+++ b/libavcodec/x86/simple_idct10_template.asm
@@ -75,6 +75,7 @@ cextern w7_min_w5
; a2 -= W6 * row[2];
; a3 -= W2 * row[2];
%ifstr %1
+ ; 1<<(%1-1) / W4 < 1
%else
paddw m10, [%1]
%endif
@@ -87,6 +88,17 @@ cextern w7_min_w5
pmaddwd m7, m1, [w4_min_w2]
pmaddwd m0, [w4_plus_w2]
pmaddwd m1, [w4_plus_w2]
+%ifstr %1
+ ; 1<<(%1-1)
+ paddd m2, [pd_round]
+ paddd m3, [pd_round]
+ paddd m4, [pd_round]
+ paddd m5, [pd_round]
+ paddd m6, [pd_round]
+ paddd m7, [pd_round]
+ paddd m0, [pd_round]
+ paddd m1, [pd_round]
+%endif
; a0: -1*row[0]-1*row[2]
; a1: -1*row[0]
--
2.6.0
More information about the ffmpeg-devel
mailing list