cglobal highbd_sub_pixel_variance%1xh, 7, 8, 13, src, src_stride, x_offset, \
y_offset, dst, dst_stride, height, sse
%endif
- %define h heightd
+ %define block_height heightd
%define bilin_filter sseq
%else
%if ARCH_X86=1 && CONFIG_PIC=1
dst, dst_stride, \
sec, sec_stride, \
height, sse, g_bilin_filter, g_pw_8
- %define h dword heightm
+ %define block_height dword heightm
%define sec_str sec_stridemp
; Store bilin_filter and pw_8 location in stack
cglobal highbd_sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, \
x_offset, y_offset, dst, dst_stride, height, \
sse, g_bilin_filter, g_pw_8
- %define h heightd
+ %define block_height heightd
; Store bilin_filter and pw_8 location in stack
GET_GOT eax
sec, sec_stride, \
height, sse
%if ARCH_X86_64
- %define h heightd
+ %define block_height heightd
%define sec_str sec_strideq
%else
- %define h dword heightm
+ %define block_height dword heightm
%define sec_str sec_stridemp
%endif
%else
cglobal highbd_sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, \
x_offset, y_offset, dst, dst_stride, height, sse
- %define h heightd
+ %define block_height heightd
%endif
%define bilin_filter bilin_filter_m
pxor m7, m7 ; sse
%if %1 < 16
- sar h, 1
+ sar block_height, 1
%endif
%if %2 == 1 ; avg
shl sec_str, 1
add secq, sec_str
%endif
%endif
- dec h
+ dec block_height
jg .x_zero_y_zero_loop
STORE_AND_RET
add secq, sec_str
%endif
%endif
- dec h
+ dec block_height
jg .x_zero_y_half_loop
STORE_AND_RET
add secq, sec_str
%endif
%endif
- dec h
+ dec block_height
jg .x_zero_y_other_loop
%undef filter_y_a
%undef filter_y_b
add secq, sec_str
%endif
%endif
- dec h
+ dec block_height
jg .x_half_y_zero_loop
STORE_AND_RET
add secq, sec_str
%endif
%endif
- dec h
+ dec block_height
jg .x_half_y_half_loop
STORE_AND_RET
add secq, sec_str
%endif
%endif
- dec h
+ dec block_height
jg .x_half_y_other_loop
%undef filter_y_a
%undef filter_y_b
add secq, sec_str
%endif
%endif
- dec h
+ dec block_height
jg .x_other_y_zero_loop
%undef filter_x_a
%undef filter_x_b
add secq, sec_str
%endif
%endif
- dec h
+ dec block_height
jg .x_other_y_half_loop
%undef filter_x_a
%undef filter_x_b
add secq, sec_str
%endif
%endif
- dec h
+ dec block_height
jg .x_other_y_other_loop
%undef filter_x_a
%undef filter_x_b
cglobal sub_pixel_variance%1xh, 7, 8, 13, src, src_stride, x_offset, \
y_offset, dst, dst_stride, height, sse
%endif
- %define h heightd
+ %define block_height heightd
%define bilin_filter sseq
%else
%if ARCH_X86=1 && CONFIG_PIC=1
dst, dst_stride, \
sec, sec_stride, \
height, sse, g_bilin_filter, g_pw_8
- %define h dword heightm
+ %define block_height dword heightm
%define sec_str sec_stridemp
;Store bilin_filter and pw_8 location in stack
cglobal sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, x_offset, \
y_offset, dst, dst_stride, height, sse, \
g_bilin_filter, g_pw_8
- %define h heightd
+ %define block_height heightd
;Store bilin_filter and pw_8 location in stack
GET_GOT eax
sec, sec_stride, \
height, sse
%if ARCH_X86_64
- %define h heightd
+ %define block_height heightd
%define sec_str sec_strideq
%else
- %define h dword heightm
+ %define block_height dword heightm
%define sec_str sec_stridemp
%endif
%else
cglobal sub_pixel_variance%1xh, 7, 7, 13, src, src_stride, x_offset, \
y_offset, dst, dst_stride, height, sse
- %define h heightd
+ %define block_height heightd
%endif
%define bilin_filter bilin_filter_m
; could perhaps use it for something more productive then
pxor m5, m5 ; dedicated zero register
%if %1 < 16
- sar h, 1
+ sar block_height, 1
%if %2 == 1 ; avg
shl sec_str, 1
%endif
%if %2 == 1 ; avg
add secq, sec_str
%endif
- dec h
+ dec block_height
jg .x_zero_y_zero_loop
STORE_AND_RET
%if %2 == 1 ; avg
add secq, sec_str
%endif
- dec h
+ dec block_height
jg .x_zero_y_half_loop
STORE_AND_RET
%if %2 == 1 ; avg
add secq, sec_str
%endif
- dec h
+ dec block_height
jg .x_zero_y_other_loop
%undef filter_y_a
%undef filter_y_b
%if %2 == 1 ; avg
add secq, sec_str
%endif
- dec h
+ dec block_height
jg .x_half_y_zero_loop
STORE_AND_RET
%if %2 == 1 ; avg
add secq, sec_str
%endif
- dec h
+ dec block_height
jg .x_half_y_half_loop
STORE_AND_RET
%if %2 == 1 ; avg
add secq, sec_str
%endif
- dec h
+ dec block_height
jg .x_half_y_other_loop
%undef filter_y_a
%undef filter_y_b
%if %2 == 1 ; avg
add secq, sec_str
%endif
- dec h
+ dec block_height
jg .x_other_y_zero_loop
%undef filter_x_a
%undef filter_x_b
%if %2 == 1 ; avg
add secq, sec_str
%endif
- dec h
+ dec block_height
jg .x_other_y_half_loop
%undef filter_x_a
%undef filter_x_b
%if %2 == 1 ; avg
add secq, sec_str
%endif
- dec h
+ dec block_height
jg .x_other_y_other_loop
%undef filter_x_a
%undef filter_x_b