diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2010-12-29 18:04:57 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-12-29 18:04:57 +0000 |
| commit | 54a959e4837520a00634248c07ab373bf2f9776e (patch) | |
| tree | 3f58c22f8368f92a954b0ef2d93dbaa1f83b1dd0 | |
| parent | a2dfe8d18d30b686c2f5401d7de8399d7b3fa4eb (diff) | |
| download | ffmpeg-54a959e4837520a00634248c07ab373bf2f9776e.tar.gz | |
Move PRED4x4_LOWPASS up so it can be used in 8x8l predict functions while
keeping the functions ordered in the source file (i.e. cosmetics).
Originally committed as revision 26136 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/x86/h264_intrapred.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index 12193defc7..832b8cdcae 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -1066,6 +1066,18 @@ cglobal pred8x8_tm_vp8_ssse3, 2,3,6 jg .loop REP_RET +; dest, left, right, src, tmp +; output: %1 = (t[n-1] + t[n]*2 + t[n+1] + 2) >> 2 +%macro PRED4x4_LOWPASS 5 + mova %5, %2 + pavgb %2, %3 + pxor %3, %5 + mova %1, %4 + pand %3, [pb_1] + psubusb %2, %3 + pavgb %1, %2 +%endmacro + ;----------------------------------------------------------------------------- ; void pred4x4_dc_mmxext(uint8_t *src, const uint8_t *topright, int stride) ;----------------------------------------------------------------------------- @@ -1173,18 +1185,6 @@ cglobal pred4x4_tm_vp8_ssse3, 3,3 movd [r1+r2*2], mm5 RET -; dest, left, right, src, tmp -; output: %1 = (t[n-1] + t[n]*2 + t[n+1] + 2) >> 2 -%macro PRED4x4_LOWPASS 5 - mova %5, %2 - pavgb %2, %3 - pxor %3, %5 - mova %1, %4 - pand %3, [pb_1] - psubusb %2, %3 - pavgb %1, %2 -%endmacro - ;----------------------------------------------------------------------------- ; void pred4x4_vertical_vp8_mmxext(uint8_t *src, const uint8_t *topright, int stride) ;----------------------------------------------------------------------------- |