Commit b597e3e1 authored by Yunqing Wang's avatar Yunqing Wang Committed by Gerrit Code Review

Merge "Fix for issue 1114 compile error"

parents 8b2ddbc7 7361ef73
...@@ -79,20 +79,13 @@ SECTION .text ...@@ -79,20 +79,13 @@ SECTION .text
%macro INC_SRC_BY_SRC_STRIDE 0 %macro INC_SRC_BY_SRC_STRIDE 0
%if ARCH_X86=1 && CONFIG_PIC=1 %if ARCH_X86=1 && CONFIG_PIC=1
lea srcq, [srcq + src_stridemp*2] add srcq, src_stridemp
add srcq, src_stridemp
%else %else
lea srcq, [srcq + src_strideq*2] lea srcq, [srcq + src_strideq*2]
%endif %endif
%endmacro %endmacro
%macro INC_SRC_BY_SRC_2STRIDE 0
%if ARCH_X86=1 && CONFIG_PIC=1
lea srcq, [srcq + src_stridemp*4]
%else
lea srcq, [srcq + src_strideq*4]
%endif
%endmacro
%macro SUBPEL_VARIANCE 1-2 0 ; W %macro SUBPEL_VARIANCE 1-2 0 ; W
%define bilin_filter_m bilin_filter_m_sse2 %define bilin_filter_m bilin_filter_m_sse2
%define filter_idx_shift 5 %define filter_idx_shift 5
...@@ -984,8 +977,9 @@ SECTION .text ...@@ -984,8 +977,9 @@ SECTION .text
.x_other_y_other_loop: .x_other_y_other_loop:
movu m2, [srcq] movu m2, [srcq]
movu m4, [srcq+2] movu m4, [srcq+2]
movu m3, [srcq+src_strideq*2] INC_SRC_BY_SRC_STRIDE
movu m5, [srcq+src_strideq*2+2] movu m3, [srcq]
movu m5, [srcq+2]
pmullw m2, filter_x_a pmullw m2, filter_x_a
pmullw m4, filter_x_b pmullw m4, filter_x_b
paddw m2, filter_rnd paddw m2, filter_rnd
...@@ -1018,7 +1012,7 @@ SECTION .text ...@@ -1018,7 +1012,7 @@ SECTION .text
SUM_SSE m0, m2, m4, m3, m6, m7 SUM_SSE m0, m2, m4, m3, m6, m7
mova m0, m5 mova m0, m5
INC_SRC_BY_SRC_2STRIDE INC_SRC_BY_SRC_STRIDE
lea dstq, [dstq + dst_strideq * 4] lea dstq, [dstq + dst_strideq * 4]
%if %2 == 1 ; avg %if %2 == 1 ; avg
add secq, sec_str add secq, sec_str
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment