ref: a0dbde2e0e58792e247e6da0b70ad852eaa3026e
parent: c8f2f084035905bddd60291a42fc8d45389c9ad8
parent: 9199798f22b984363476b90bc62d27c2752643e3
author: volvet <qizh@cisco.com>
date: Fri Mar 14 13:52:56 EDT 2014
Merge pull request #493 from mstorsjo/fix-macro-typo Fix a typo in a macro name, EXTENTION -> EXTENSION
--- a/codec/common/asm_inc.asm
+++ b/codec/common/asm_inc.asm
@@ -329,7 +329,7 @@
%endif
%endmacro
-%macro SIGN_EXTENTION 2
+%macro SIGN_EXTENSION 2
%ifndef X86_32
movsx %1, %2
%endif
--- a/codec/common/deblock.asm
+++ b/codec/common/deblock.asm
@@ -5185,7 +5185,7 @@
%assign push_num 3
LOAD_3_PARA
- SIGN_EXTENTION r1, r1d
+ SIGN_EXTENSION r1, r1d
mov r5, r7
mov r3, r7
@@ -5263,7 +5263,7 @@
%assign push_num 2
LOAD_3_PARA
- SIGN_EXTENTION r1, r1d
+ SIGN_EXTENSION r1, r1d
mov r4, r7
mov r3, r7
--- a/codec/common/expand_picture.asm
+++ b/codec/common/expand_picture.asm
@@ -376,9 +376,9 @@
%assign push_num 3
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r2, r2d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r2, r2d
+ SIGN_EXTENSION r3, r3d
;also prepare for cross border pData top-left:xmm3
@@ -503,9 +503,9 @@
%assign push_num 3
LOAD_4_PARA
- SIGN_EXTENTION r1,r1d
- SIGN_EXTENTION r2,r2d
- SIGN_EXTENTION r3,r3d
+ SIGN_EXTENSION r1,r1d
+ SIGN_EXTENSION r2,r2d
+ SIGN_EXTENSION r3,r3d
;also prepare for cross border pData top-left:xmm3
@@ -628,9 +628,9 @@
%assign push_num 3
LOAD_4_PARA
- SIGN_EXTENTION r1,r1d
- SIGN_EXTENTION r2,r2d
- SIGN_EXTENTION r3,r3d
+ SIGN_EXTENSION r1,r1d
+ SIGN_EXTENSION r2,r2d
+ SIGN_EXTENSION r3,r3d
;also prepare for cross border pData top-left:xmm3
--- a/codec/common/satd_sad.asm
+++ b/codec/common/satd_sad.asm
@@ -166,8 +166,8 @@
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
movd xmm0, [r0]
movd xmm1, [r0+r1]
lea r0 , [r0+2*r1]
@@ -246,8 +246,8 @@
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
pxor xmm6, xmm6
pxor xmm7, xmm7
SSE2_GetSatd8x8
@@ -273,8 +273,8 @@
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
pxor xmm6, xmm6
pxor xmm7, xmm7
@@ -305,8 +305,8 @@
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
push r0
push r2
pxor xmm6, xmm6
@@ -344,8 +344,8 @@
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
push r0
push r2
pxor xmm6, xmm6
@@ -1030,8 +1030,8 @@
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
movdqa xmm4,[HSwapSumSubDB1]
movd xmm2,[r2]
movd xmm5,[r2+r3]
@@ -1095,8 +1095,8 @@
%endif
%assign push_num 2
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
movdqa xmm7, [HSumSubDB1]
lea r4, [r1+r1*2]
lea r5, [r3+r3*2]
@@ -1137,8 +1137,8 @@
%endif
%assign push_num 3
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
movdqa xmm7, [HSumSubDB1]
lea r4, [r1+r1*2]
lea r5, [r3+r3*2]
@@ -1181,8 +1181,8 @@
%endif
%assign push_num 2
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
push r0
push r2
@@ -1238,8 +1238,8 @@
%endif
%assign push_num 3
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
push r0
push r2
@@ -1370,8 +1370,8 @@
%assign push_num 2
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
lea r4, [3*r1]
lea r5, [3*r3]
@@ -1414,8 +1414,8 @@
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
movdqu xmm0, [r2]
MOVDQ xmm2, [r0]
psadbw xmm0, xmm2
@@ -1446,8 +1446,8 @@
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
pxor xmm6, xmm6
SSE2_GetSad8x4
@@ -1498,7 +1498,7 @@
%assign push_num 3
mov r0, arg1
mov r1, arg2
- SIGN_EXTENTION r1, r1d
+ SIGN_EXTENSION r1, r1d
pxor xmm7, xmm7
;ecx r2, edx r4, edi r5
@@ -1516,7 +1516,7 @@
mov r5, 8
add r5, r2
mov r3, arg4
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r3, r3d
movq xmm0, [r0]
movhps xmm0, [r0+r1]
@@ -1604,8 +1604,8 @@
pop r2
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
pxor xmm6, xmm6
SSE2_GetSad8x4
lea r0, [r0+2*r1]
@@ -1655,8 +1655,8 @@
%assign push_num 0
LOAD_5_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
pxor xmm4, xmm4 ;sad pRefMb-i_stride_ref
pxor xmm5, xmm5 ;sad pRefMb+i_stride_ref
pxor xmm6, xmm6 ;sad pRefMb-1
@@ -1781,8 +1781,8 @@
%assign push_num 0
LOAD_5_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
pxor xmm4, xmm4 ;sad pRefMb-i_stride_ref
pxor xmm5, xmm5 ;sad pRefMb+i_stride_ref
pxor xmm6, xmm6 ;sad pRefMb-1
@@ -1874,8 +1874,8 @@
%assign push_num 0
LOAD_5_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
pxor xmm4, xmm4 ;sad pRefMb-i_stride_ref
pxor xmm5, xmm5 ;sad pRefMb+i_stride_ref
pxor xmm6, xmm6 ;sad pRefMb-1
@@ -2094,8 +2094,8 @@
%assign push_num 0
LOAD_5_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
pxor xmm4, xmm4 ;sad pRefMb-i_stride_ref
pxor xmm5, xmm5 ;sad pRefMb+i_stride_ref
pxor xmm6, xmm6 ;sad pRefMb-1
@@ -2222,8 +2222,8 @@
%assign push_num 0
LOAD_5_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
movd xmm0, [r0]
movd xmm1, [r0+r1]
lea r0, [r0+2*r1]
@@ -2313,8 +2313,8 @@
%assign push_num 0
LOAD_4_PARA
- SIGN_EXTENTION r1, r1d
- SIGN_EXTENTION r3, r3d
+ SIGN_EXTENSION r1, r1d
+ SIGN_EXTENSION r3, r3d
movd mm0, [r0]
movd mm1, [r0+r1]
punpckldq mm0, mm1
--- a/codec/common/vaa.asm
+++ b/codec/common/vaa.asm
@@ -161,7 +161,7 @@
%assign push_num 0
LOAD_2_PARA
- SIGN_EXTENTION r1,r1d
+ SIGN_EXTENSION r1,r1d
%ifdef X86_32
push r3
@@ -256,7 +256,7 @@
%assign push_num 0
LOAD_2_PARA
- SIGN_EXTENTION r1,r1d
+ SIGN_EXTENSION r1,r1d
%ifdef X86_32
push r3
--- a/codec/encoder/core/asm/memzero.asm
+++ b/codec/encoder/core/asm/memzero.asm
@@ -69,7 +69,7 @@
%assign push_num 0
LOAD_2_PARA
- SIGN_EXTENTION r1, r1d
+ SIGN_EXTENSION r1, r1d
neg r1
pxor xmm0, xmm0
@@ -94,7 +94,7 @@
%assign push_num 0
LOAD_2_PARA
- SIGN_EXTENTION r1, r1d
+ SIGN_EXTENSION r1, r1d
neg r1
pxor mm0, mm0
@@ -124,7 +124,7 @@
%assign push_num 0
LOAD_2_PARA
- SIGN_EXTENTION r1, r1d
+ SIGN_EXTENSION r1, r1d
neg r1
pxor mm0, mm0
--- a/codec/processing/src/asm/vaa.asm
+++ b/codec/processing/src/asm/vaa.asm
@@ -468,8 +468,8 @@
push r15
%assign push_num 4
LOAD_5_PARA
- SIGN_EXTENTION r1,r1d
- SIGN_EXTENTION r3,r3d
+ SIGN_EXTENSION r1,r1d
+ SIGN_EXTENSION r3,r3d
mov r12,010h
pxor xmm7, xmm7
@@ -570,9 +570,9 @@
push r13
%assign push_num 2
LOAD_7_PARA
- SIGN_EXTENTION r2,r2d
- SIGN_EXTENTION r3,r3d
- SIGN_EXTENTION r4,r4d
+ SIGN_EXTENSION r2,r2d
+ SIGN_EXTENSION r3,r3d
+ SIGN_EXTENSION r4,r4d
mov r12,r4
shr r2, 4 ; iPicWidth/16
@@ -813,9 +813,9 @@
mov r5, arg6 ;psad8x8
%endif
mov r14,arg7
- SIGN_EXTENTION r2,r2d
- SIGN_EXTENTION r3,r3d
- SIGN_EXTENTION r4,r4d
+ SIGN_EXTENSION r2,r2d
+ SIGN_EXTENSION r3,r3d
+ SIGN_EXTENSION r4,r4d
mov r13,r4
shr r2,4
@@ -1113,9 +1113,9 @@
mov r4,arg5
%endif
mov r14,arg7
- SIGN_EXTENTION r2,r2d
- SIGN_EXTENTION r3,r3d
- SIGN_EXTENTION r4,r4d
+ SIGN_EXTENSION r2,r2d
+ SIGN_EXTENSION r3,r3d
+ SIGN_EXTENSION r4,r4d
mov r13,r4
shr r2,4 ; iPicWidth/16
@@ -1685,9 +1685,9 @@
; mov r5,arg6
%endif
mov r14,arg7
- SIGN_EXTENTION r2,r2d
- SIGN_EXTENTION r3,r3d
- SIGN_EXTENTION r4,r4d
+ SIGN_EXTENSION r2,r2d
+ SIGN_EXTENSION r3,r3d
+ SIGN_EXTENSION r4,r4d
mov r13,r4
@@ -1864,9 +1864,9 @@
mov r4,arg5
;mov r5,arg6
%endif
- SIGN_EXTENTION r2,r2d
- SIGN_EXTENTION r3,r3d
- SIGN_EXTENTION r4,r4d
+ SIGN_EXTENSION r2,r2d
+ SIGN_EXTENSION r3,r3d
+ SIGN_EXTENSION r4,r4d
mov r13,r4
shr r2, 4 ; iPicWidth/16