---
libavcodec/x86/h264_intrapred.asm | 54 ++++++++++++++++++------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/libavcodec/x86/h264_intrapred.asm
b/libavcodec/x86/h264_intrapred.asm
index 9b2c1cd..87d32c4 100644
--- a/libavcodec/x86/h264_intrapred.asm
+++ b/libavcodec/x86/h264_intrapred.asm
@@ -90,7 +90,7 @@ cglobal pred16x16_vertical_sse, 2,3
%macro PRED16x16_H 0
cglobal pred16x16_horizontal, 2,3
mov r2, 8
-%ifidn %1, ssse3
+%if cpuflag(ssse3)
mova m2, [pb_3]
%endif
.loop:
@@ -295,8 +295,8 @@ cglobal pred16x16_tm_vp8_sse2, 2,6,6
; void pred16x16_plane(uint8_t *src, int stride)
;-----------------------------------------------------------------------------
-%macro H264_PRED16x16_PLANE 2
-cglobal pred16x16_plane_%2, 2, 9, %1
+%macro H264_PRED16x16_PLANE 1
+cglobal pred16x16_plane_%1, 2,9,7
mov r2, r1 ; +stride
neg r1 ; -stride
@@ -431,13 +431,13 @@ cglobal pred16x16_plane_%2, 2, 9, %1
mov r0, r0m
%endif
-%ifidn %2, h264
+%ifidn %1, h264
lea r5, [r5*5+32]
sar r5, 6
-%elifidn %2, rv40
+%elifidn %1, rv40
lea r5, [r5*5]
sar r5, 6
-%elifidn %2, svq3
+%elifidn %1, svq3
test r5, r5
lea r6, [r5+3]
cmovs r5, r6
@@ -456,8 +456,8 @@ cglobal pred16x16_plane_%2, 2, 9, %1
movd r1d, m0
movsx r1d, r1w
-%ifnidn %2, svq3
-%ifidn %2, h264
+%ifnidn %1, svq3
+%ifidn %1, h264
lea r1d, [r1d*5+32]
%else ; rv40
lea r1d, [r1d*5]
@@ -502,7 +502,7 @@ cglobal pred16x16_plane_%2, 2, 9, %1
punpckldq m1, m1
punpckldq m3, m3
%endif
-%ifidn %2, svq3
+%ifidn %1, svq3
SWAP 0, 1
%endif
mova m2, m0
@@ -576,29 +576,29 @@ cglobal pred16x16_plane_%2, 2, 9, %1
%endmacro
INIT_MMX mmx
-H264_PRED16x16_PLANE 0, h264
-H264_PRED16x16_PLANE 0, rv40
-H264_PRED16x16_PLANE 0, svq3
+H264_PRED16x16_PLANE h264
+H264_PRED16x16_PLANE rv40
+H264_PRED16x16_PLANE svq3
INIT_MMX mmx2
-H264_PRED16x16_PLANE 0, h264
-H264_PRED16x16_PLANE 0, rv40
-H264_PRED16x16_PLANE 0, svq3
+H264_PRED16x16_PLANE h264
+H264_PRED16x16_PLANE rv40
+H264_PRED16x16_PLANE svq3
INIT_XMM sse2
-H264_PRED16x16_PLANE 8, h264
-H264_PRED16x16_PLANE 8, rv40
-H264_PRED16x16_PLANE 8, svq3
+H264_PRED16x16_PLANE h264
+H264_PRED16x16_PLANE rv40
+H264_PRED16x16_PLANE svq3
INIT_XMM ssse3
-H264_PRED16x16_PLANE 8, h264
-H264_PRED16x16_PLANE 8, rv40
-H264_PRED16x16_PLANE 8, svq3
+H264_PRED16x16_PLANE h264
+H264_PRED16x16_PLANE rv40
+H264_PRED16x16_PLANE svq3
INIT_XMM
;-----------------------------------------------------------------------------
; void pred8x8_plane(uint8_t *src, int stride)
;-----------------------------------------------------------------------------
-%macro H264_PRED8x8_PLANE 1
-cglobal pred8x8_plane, 2, 9, %1
+%macro H264_PRED8x8_PLANE 0
+cglobal pred8x8_plane, 2,9,7
mov r2, r1 ; +stride
neg r1 ; -stride
@@ -779,13 +779,13 @@ ALIGN 16
%endmacro
INIT_MMX mmx
-H264_PRED8x8_PLANE 0
+H264_PRED8x8_PLANE
INIT_MMX mmx2
-H264_PRED8x8_PLANE 0
+H264_PRED8x8_PLANE
INIT_XMM sse2
-H264_PRED8x8_PLANE 8
+H264_PRED8x8_PLANE
INIT_XMM ssse3
-H264_PRED8x8_PLANE 8
+H264_PRED8x8_PLANE
INIT_XMM
;-----------------------------------------------------------------------------
--
1.7.4.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
