diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 12:34:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-14 12:34:30 +0100 |
| commit | a1b5c9634e87160251fd41635beb01da157cf00c (patch) | |
| tree | a62b214125e71d0f6a0a7ce910100a3641cc010e /libavcodec/x86/vp8dsp.asm | |
| parent | b0c543b1deba77647911be159b013760b5d05db3 (diff) | |
| parent | 26301caaa1aec5d71b564bff452147d6183370bf (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: mmx2 ---> mmxext in asm constructs
Conflicts:
libavcodec/x86/h264_chromamc_10bit.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264dsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/vp8dsp.asm')
| -rw-r--r-- | libavcodec/x86/vp8dsp.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libavcodec/x86/vp8dsp.asm b/libavcodec/x86/vp8dsp.asm index 7c53419fbc..37ae336123 100644 --- a/libavcodec/x86/vp8dsp.asm +++ b/libavcodec/x86/vp8dsp.asm @@ -338,7 +338,7 @@ INIT_XMM ssse3 FILTER_SSSE3 8 ; 4x4 block, H-only 4-tap filter -INIT_MMX mmx2 +INIT_MMX mmxext cglobal put_vp8_epel4_h4, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, height, mx, picreg shl mxd, 4 %ifdef PIC @@ -386,7 +386,7 @@ cglobal put_vp8_epel4_h4, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, he REP_RET ; 4x4 block, H-only 6-tap filter -INIT_MMX mmx2 +INIT_MMX mmxext cglobal put_vp8_epel4_h6, 6, 6 + npicregs, 0, dst, dststride, src, srcstride, height, mx, picreg lea mxd, [mxq*3] %ifdef PIC @@ -673,7 +673,7 @@ cglobal put_vp8_epel%1_v6, 7, 7, 8, dst, dststride, src, srcstride, height, picr REP_RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext FILTER_V 4 INIT_XMM sse2 FILTER_V 8 @@ -769,7 +769,7 @@ cglobal put_vp8_bilinear%1_h, 6, 6 + npicregs, 7, dst, dststride, src, srcstride REP_RET %endmacro -INIT_MMX mmx2 +INIT_MMX mmxext FILTER_BILINEAR 4 INIT_XMM sse2 FILTER_BILINEAR 8 @@ -1611,7 +1611,7 @@ cglobal vp8_%1_loop_filter_simple, 3, %2, 8, dst, stride, flim, cntr INIT_MMX mmx SIMPLE_LOOPFILTER v, 4 SIMPLE_LOOPFILTER h, 5 -INIT_MMX mmx2 +INIT_MMX mmxext SIMPLE_LOOPFILTER v, 4 SIMPLE_LOOPFILTER h, 5 %endif @@ -1835,7 +1835,7 @@ cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, dst, stride, flimE, flimI, hevthr psubusb m6, m5 ; q2-q1 por m6, m4 ; abs(q2-q1) -%if notcpuflag(mmx2) +%if notcpuflag(mmxext) mova m4, m_flimI pxor m3, m3 psubusb m0, m4 @@ -1875,7 +1875,7 @@ cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, dst, stride, flimE, flimI, hevthr psubusb m1, m3 ; p1-p0 psubusb m6, m2 ; p0-p1 por m1, m6 ; abs(p1-p0) -%if notcpuflag(mmx2) +%if notcpuflag(mmxext) mova m6, m1 psubusb m1, m4 psubusb m6, m_hevthr @@ -1906,7 +1906,7 @@ cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, dst, stride, flimE, flimI, hevthr psubusb m1, m5 ; q0-q1 psubusb m7, m4 ; q1-q0 por m1, m7 ; abs(q1-q0) -%if notcpuflag(mmx2) +%if notcpuflag(mmxext) mova m7, m1 psubusb m1, m6 psubusb m7, m_hevthr @@ -2014,14 +2014,14 @@ cglobal vp8_%1_loop_filter16y_inner, 5, 5, 13, dst, stride, flimE, flimI, hevthr %else mova m6, m_maskres %endif -%if notcpuflag(mmx2) +%if notcpuflag(mmxext) mova m7, [pb_1] %else ; mmxext/sse2 pxor m7, m7 %endif pand m0, m6 pand m1, m6 -%if notcpuflag(mmx2) +%if notcpuflag(mmxext) paddusb m0, m7 pand m1, [pb_FE] pandn m7, m0 @@ -2097,7 +2097,7 @@ INNER_LOOPFILTER h, 16 INNER_LOOPFILTER v, 8 INNER_LOOPFILTER h, 8 -INIT_MMX mmx2 +INIT_MMX mmxext INNER_LOOPFILTER v, 16 INNER_LOOPFILTER h, 16 INNER_LOOPFILTER v, 8 @@ -2343,7 +2343,7 @@ cglobal vp8_%1_loop_filter16y_mbedge, 5, 5, 15, dst1, stride, flimE, flimI, hevt psubusb m6, m5 ; q2-q1 por m6, m4 ; abs(q2-q1) -%if notcpuflag(mmx2) +%if notcpuflag(mmxext) mova m4, m_flimI pxor m3, m3 psubusb m0, m4 @@ -2383,7 +2383,7 @@ cglobal vp8_%1_loop_filter16y_mbedge, 5, 5, 15, dst1, stride, flimE, flimI, hevt psubusb m1, m3 ; p1-p0 psubusb m6, m2 ; p0-p1 por m1, m6 ; abs(p1-p0) -%if notcpuflag(mmx2) +%if notcpuflag(mmxext) mova m6, m1 psubusb m1, m4 psubusb m6, m_hevthr @@ -2414,7 +2414,7 @@ cglobal vp8_%1_loop_filter16y_mbedge, 5, 5, 15, dst1, stride, flimE, flimI, hevt psubusb m1, m5 ; q0-q1 psubusb m7, m4 ; q1-q0 por m1, m7 ; abs(q1-q0) -%if notcpuflag(mmx2) +%if notcpuflag(mmxext) mova m7, m1 psubusb m1, m6 psubusb m7, m_hevthr @@ -2755,7 +2755,7 @@ MBEDGE_LOOPFILTER h, 16 MBEDGE_LOOPFILTER v, 8 MBEDGE_LOOPFILTER h, 8 -INIT_MMX mmx2 +INIT_MMX mmxext MBEDGE_LOOPFILTER v, 16 MBEDGE_LOOPFILTER h, 16 MBEDGE_LOOPFILTER v, 8 |