diff options
| author | Thomas Mundt <tmundt75@gmail.com> | 2017-04-20 23:26:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-04-22 20:12:15 +0200 |
| commit | 207e6debf866ae4f8bdf864a5f389ef42660324d (patch) | |
| tree | 87e4bb430785c39207f690ac9a1284e604f808d6 /libavfilter/x86 | |
| parent | 362f6c91e466b2114d0827c6d58e26e121ed11e8 (diff) | |
avfilter/interlace: change lowpass_line function prototype
Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter/x86')
| -rw-r--r-- | libavfilter/x86/vf_interlace.asm | 30 | ||||
| -rw-r--r-- | libavfilter/x86/vf_interlace_init.c | 6 | ||||
| -rw-r--r-- | libavfilter/x86/vf_tinterlace_init.c | 6 |
3 files changed, 19 insertions, 23 deletions
diff --git a/libavfilter/x86/vf_interlace.asm b/libavfilter/x86/vf_interlace.asm index f70c700965..8a0dd3bdea 100644 --- a/libavfilter/x86/vf_interlace.asm +++ b/libavfilter/x86/vf_interlace.asm @@ -28,32 +28,32 @@ SECTION_RODATA SECTION .text %macro LOWPASS_LINE 0 -cglobal lowpass_line, 5, 5, 7 - add r0, r1 - add r2, r1 - add r3, r1 - add r4, r1 - neg r1 +cglobal lowpass_line, 5, 5, 7, dst, h, src, mref, pref + add dstq, hq + add srcq, hq + add mrefq, srcq + add prefq, srcq + neg hq pcmpeqb m6, m6 .loop: - mova m0, [r3+r1] - mova m1, [r3+r1+mmsize] - pavgb m0, [r4+r1] - pavgb m1, [r4+r1+mmsize] + mova m0, [mrefq+hq] + mova m1, [mrefq+hq+mmsize] + pavgb m0, [prefq+hq] + pavgb m1, [prefq+hq+mmsize] pxor m0, m6 pxor m1, m6 - pxor m2, m6, [r2+r1] - pxor m3, m6, [r2+r1+mmsize] + pxor m2, m6, [srcq+hq] + pxor m3, m6, [srcq+hq+mmsize] pavgb m0, m2 pavgb m1, m3 pxor m0, m6 pxor m1, m6 - mova [r0+r1], m0 - mova [r0+r1+mmsize], m1 + mova [dstq+hq], m0 + mova [dstq+hq+mmsize], m1 - add r1, 2*mmsize + add hq, 2*mmsize jl .loop REP_RET %endmacro diff --git a/libavfilter/x86/vf_interlace_init.c b/libavfilter/x86/vf_interlace_init.c index 52a22f80c7..7d8acd6143 100644 --- a/libavfilter/x86/vf_interlace_init.c +++ b/libavfilter/x86/vf_interlace_init.c @@ -28,12 +28,10 @@ void ff_lowpass_line_sse2(uint8_t *dstp, ptrdiff_t linesize, const uint8_t *srcp, - const uint8_t *srcp_above, - const uint8_t *srcp_below); + ptrdiff_t mref, ptrdiff_t pref); void ff_lowpass_line_avx (uint8_t *dstp, ptrdiff_t linesize, const uint8_t *srcp, - const uint8_t *srcp_above, - const uint8_t *srcp_below); + ptrdiff_t mref, ptrdiff_t pref); av_cold void ff_interlace_init_x86(InterlaceContext *s) { diff --git a/libavfilter/x86/vf_tinterlace_init.c b/libavfilter/x86/vf_tinterlace_init.c index ddb0cced36..175b5cff01 100644 --- a/libavfilter/x86/vf_tinterlace_init.c +++ b/libavfilter/x86/vf_tinterlace_init.c @@ -29,12 +29,10 @@ void ff_lowpass_line_sse2(uint8_t *dstp, ptrdiff_t linesize, const uint8_t *srcp, - const uint8_t *srcp_above, - const uint8_t *srcp_below); + ptrdiff_t mref, ptrdiff_t pref); void ff_lowpass_line_avx (uint8_t *dstp, ptrdiff_t linesize, const uint8_t *srcp, - const uint8_t *srcp_above, - const uint8_t *srcp_below); + ptrdiff_t mref, ptrdiff_t pref); av_cold void ff_tinterlace_init_x86(TInterlaceContext *s) { |