diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-02-09 16:13:34 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-02-09 16:13:34 +0000 |
| commit | d2578ff9f1eeec2b31a807d03af5efed2669f71c (patch) | |
| tree | b846c10fd6db994f0819e72329d6a4812d7c15e3 | |
| parent | 74cc33c2354c24986dc5332a7aeb1a9516a1d0c5 (diff) | |
| download | ffmpeg-d2578ff9f1eeec2b31a807d03af5efed2669f71c.tar.gz | |
ARMv6 optimised pix_abs8
Originally committed as revision 21700 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/arm/dsputil_armv6.S | 30 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 6 |
2 files changed, 36 insertions, 0 deletions
diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S index 5f4f5e43c9..2efa3d5983 100644 --- a/libavcodec/arm/dsputil_armv6.S +++ b/libavcodec/arm/dsputil_armv6.S @@ -428,3 +428,33 @@ function ff_pix_abs16_y2_armv6, export=1 pop {r4-r11, pc} .endfunc + +function ff_pix_abs8_armv6, export=1 + pld [r2, r3] + ldr r12, [sp] + push {r4-r9, lr} + mov r0, #0 + mov lr, #0 + ldrd r4, r5, [r1], r3 +1: + subs r12, r12, #2 + ldr r7, [r2, #4] + ldr r6, [r2], r3 + ldrd r8, r9, [r1], r3 + usada8 r0, r4, r6, r0 + pld [r2, r3] + usada8 lr, r5, r7, lr + ldr r7, [r2, #4] + ldr r6, [r2], r3 + beq 2f + ldrd r4, r5, [r1], r3 + usada8 r0, r8, r6, r0 + pld [r2, r3] + usada8 lr, r9, r7, lr + b 1b +2: + usada8 r0, r8, r6, r0 + usada8 lr, r9, r7, lr + add r0, r0, lr + pop {r4-r9, pc} +.endfunc diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index 83c1ea8716..972e743ed6 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -57,6 +57,9 @@ int ff_pix_abs16_x2_armv6(void *s, uint8_t *blk1, uint8_t *blk2, int ff_pix_abs16_y2_armv6(void *s, uint8_t *blk1, uint8_t *blk2, int line_size, int h); +int ff_pix_abs8_armv6(void *s, uint8_t *blk1, uint8_t *blk2, + int line_size, int h); + void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx) { if (!avctx->lowres && (avctx->idct_algo == FF_IDCT_AUTO || @@ -94,5 +97,8 @@ void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx) c->pix_abs[0][1] = ff_pix_abs16_x2_armv6; c->pix_abs[0][2] = ff_pix_abs16_y2_armv6; + c->pix_abs[1][0] = ff_pix_abs8_armv6; + c->sad[0] = ff_pix_abs16_armv6; + c->sad[1] = ff_pix_abs8_armv6; } |