summaryrefslogtreecommitdiff
path: root/libavcodec/x86/v210enc.asm
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/x86/v210enc.asm')
-rw-r--r--libavcodec/x86/v210enc.asm57
1 files changed, 36 insertions, 21 deletions
diff --git a/libavcodec/x86/v210enc.asm b/libavcodec/x86/v210enc.asm
index bdefcdbfa1..7ff1f4948f 100644
--- a/libavcodec/x86/v210enc.asm
+++ b/libavcodec/x86/v210enc.asm
@@ -21,27 +21,26 @@
%include "libavutil/x86/x86util.asm"
-SECTION_RODATA
+SECTION_RODATA 32
-v210_enc_min_10: times 8 dw 0x4
-v210_enc_max_10: times 8 dw 0x3fb
+v210_enc_min_10: times 16 dw 0x4
+v210_enc_max_10: times 16 dw 0x3fb
-v210_enc_luma_mult_10: dw 4,1,16,4,1,16,0,0
-v210_enc_luma_shuf_10: db -1,0,1,-1,2,3,4,5,-1,6,7,-1,8,9,10,11
+v210_enc_luma_mult_10: times 2 dw 4,1,16,4,1,16,0,0
+v210_enc_luma_shuf_10: times 2 db -1,0,1,-1,2,3,4,5,-1,6,7,-1,8,9,10,11
-v210_enc_chroma_mult_10: dw 1,4,16,0,16,1,4,0
-v210_enc_chroma_shuf_10: db 0,1,8,9,-1,2,3,-1,10,11,4,5,-1,12,13,-1
+v210_enc_chroma_mult_10: times 2 dw 1,4,16,0,16,1,4,0
+v210_enc_chroma_shuf_10: times 2 db 0,1,8,9,-1,2,3,-1,10,11,4,5,-1,12,13,-1
-v210_enc_min_8: times 16 db 0x1
-v210_enc_max_8: times 16 db 0xfe
+v210_enc_min_8: times 32 db 0x1
+v210_enc_max_8: times 32 db 0xfe
-v210_enc_luma_shuf_8: db 6,-1,7,-1,8,-1,9,-1,10,-1,11,-1,-1,-1,-1,-1
-v210_enc_luma_mult_8: dw 16,4,64,16,4,64,0,0
+v210_enc_luma_mult_8: times 2 dw 16,4,64,16,4,64,0,0
+v210_enc_luma_shuf_8: times 2 db 6,-1,7,-1,8,-1,9,-1,10,-1,11,-1,-1,-1,-1,-1
-v210_enc_chroma_shuf1_8: db 0,-1,1,-1,2,-1,3,-1,8,-1,9,-1,10,-1,11,-1
-v210_enc_chroma_shuf2_8: db 3,-1,4,-1,5,-1,7,-1,11,-1,12,-1,13,-1,15,-1
-
-v210_enc_chroma_mult_8: dw 4,16,64,0,64,4,16,0
+v210_enc_chroma_mult_8: times 2 dw 4,16,64,0,64,4,16,0
+v210_enc_chroma_shuf1_8: times 2 db 0,-1,1,-1,2,-1,3,-1,8,-1,9,-1,10,-1,11,-1
+v210_enc_chroma_shuf2_8: times 2 db 3,-1,4,-1,5,-1,7,-1,11,-1,12,-1,13,-1,15,-1
SECTION .text
@@ -102,7 +101,10 @@ cglobal v210_planar_pack_8, 5, 5, 7, y, u, v, dst, width
pxor m6, m6
.loop
- movu m1, [yq+2*widthq]
+ movu xm1, [yq+2*widthq]
+%if cpuflag(avx2)
+ vinserti128 m1, m1, [yq+2*widthq+12], 1
+%endif
CLIPUB m1, m4, m5
punpcklbw m0, m1, m6
@@ -115,8 +117,13 @@ cglobal v210_planar_pack_8, 5, 5, 7, y, u, v, dst, width
pshufb m0, [v210_enc_luma_shuf_10]
pshufb m1, [v210_enc_luma_shuf_10]
- movq m3, [uq+widthq]
- movhps m3, [vq+widthq]
+ movq xm3, [uq+widthq]
+ movhps xm3, [vq+widthq]
+%if cpuflag(avx2)
+ movq xm2, [uq+widthq+6]
+ movhps xm2, [vq+widthq+6]
+ vinserti128 m3, m3, xm2, 1
+%endif
CLIPUB m3, m4, m5
; shuffle and multiply to get the same packing as in 10-bit
@@ -131,11 +138,15 @@ cglobal v210_planar_pack_8, 5, 5, 7, y, u, v, dst, width
por m0, m2
por m1, m3
- movu [dstq], m0
- movu [dstq+mmsize], m1
+ movu [dstq], xm0
+ movu [dstq+16], xm1
+%if cpuflag(avx2)
+ vextracti128 [dstq+32], m0, 1
+ vextracti128 [dstq+48], m1, 1
+%endif
add dstq, 2*mmsize
- add widthq, 6
+ add widthq, (mmsize*3)/8
jl .loop
RET
@@ -149,3 +160,7 @@ v210_planar_pack_8
INIT_XMM avx
v210_planar_pack_8
%endif
+%if HAVE_AVX2_EXTERNAL
+INIT_YMM avx2
+v210_planar_pack_8
+%endif