Commit 623d217e authored by James Almer's avatar James Almer

avcodec/aacps: move checks for valid length outside the stereo_interpolate dsp function

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent b3446862
...@@ -979,9 +979,10 @@ static void stereo_processing(PSContext *ps, INTFLOAT (*l)[32][2], INTFLOAT (*r) ...@@ -979,9 +979,10 @@ static void stereo_processing(PSContext *ps, INTFLOAT (*l)[32][2], INTFLOAT (*r)
h_step[1][2] = AAC_MSUB31_V3(H21[1][e+1][b], h[1][2], width); h_step[1][2] = AAC_MSUB31_V3(H21[1][e+1][b], h[1][2], width);
h_step[1][3] = AAC_MSUB31_V3(H22[1][e+1][b], h[1][3], width); h_step[1][3] = AAC_MSUB31_V3(H22[1][e+1][b], h[1][3], width);
} }
ps->dsp.stereo_interpolate[!PS_BASELINE && ps->enable_ipdopd]( if (stop - start)
l[k] + 1 + start, r[k] + 1 + start, ps->dsp.stereo_interpolate[!PS_BASELINE && ps->enable_ipdopd](
h, h_step, stop - start); l[k] + 1 + start, r[k] + 1 + start,
h, h_step, stop - start);
} }
} }
} }
......
...@@ -94,8 +94,6 @@ INIT_XMM sse3 ...@@ -94,8 +94,6 @@ INIT_XMM sse3
cglobal ps_stereo_interpolate, 5, 5, 6, l, r, h, h_step, n cglobal ps_stereo_interpolate, 5, 5, 6, l, r, h, h_step, n
movaps m0, [hq] movaps m0, [hq]
movaps m1, [h_stepq] movaps m1, [h_stepq]
cmp nd, 0
jle .ret
unpcklps m4, m0, m0 unpcklps m4, m0, m0
unpckhps m0, m0 unpckhps m0, m0
unpcklps m5, m1, m1 unpcklps m5, m1, m1
...@@ -118,7 +116,6 @@ align 16 ...@@ -118,7 +116,6 @@ align 16
movhps [rq+nq], m2 movhps [rq+nq], m2
add nq, 8 add nq, 8
jl .loop jl .loop
.ret:
REP_RET REP_RET
;*************************************************************************** ;***************************************************************************
...@@ -128,8 +125,6 @@ align 16 ...@@ -128,8 +125,6 @@ align 16
;*************************************************************************** ;***************************************************************************
INIT_XMM sse3 INIT_XMM sse3
cglobal ps_stereo_interpolate_ipdopd, 5, 5, 10, l, r, h, h_step, n cglobal ps_stereo_interpolate_ipdopd, 5, 5, 10, l, r, h, h_step, n
cmp nd, 0
jle .ret
movaps m0, [hq] movaps m0, [hq]
movaps m1, [hq+mmsize] movaps m1, [hq+mmsize]
%if ARCH_X86_64 %if ARCH_X86_64
...@@ -169,7 +164,6 @@ align 16 ...@@ -169,7 +164,6 @@ align 16
movhps [rq+nq], m2 movhps [rq+nq], m2
add nq, 8 add nq, 8
jl .loop jl .loop
.ret:
REP_RET REP_RET
;******************************************************************* ;*******************************************************************
......
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