diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-02-09 16:13:49 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-02-09 16:13:49 +0000 |
| commit | 66ec243d95e971903d26764916991fa0c36a9481 (patch) | |
| tree | 311c1d5672e92fae56ba64f7821753e6eed524a3 /libavcodec/arm | |
| parent | 0c28474c92093d9b8a06ef7f6cf3d1c974422aad (diff) | |
ARMv6 optimised pix_norm1
Originally committed as revision 21704 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/dsputil_armv6.S | 30 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 4 |
2 files changed, 34 insertions, 0 deletions
diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S index 161a387f95..ffe6c42252 100644 --- a/libavcodec/arm/dsputil_armv6.S +++ b/libavcodec/arm/dsputil_armv6.S @@ -564,3 +564,33 @@ function ff_sse16_armv6, export=1 pop {r4-r9, pc} .endfunc + +function ff_pix_norm1_armv6, export=1 + push {r4-r6, lr} + mov r12, #16 + mov lr, #0 +1: + ldm r0, {r2-r5} + uxtb16 r6, r2 + uxtb16 r2, r2, ror #8 + smlad lr, r6, r6, lr + uxtb16 r6, r3 + smlad lr, r2, r2, lr + uxtb16 r3, r3, ror #8 + smlad lr, r6, r6, lr + uxtb16 r6, r4 + smlad lr, r3, r3, lr + uxtb16 r4, r4, ror #8 + smlad lr, r6, r6, lr + uxtb16 r6, r5 + smlad lr, r4, r4, lr + uxtb16 r5, r5, ror #8 + smlad lr, r6, r6, lr + subs r12, r12, #1 + add r0, r0, r1 + smlad lr, r5, r5, lr + bgt 1b + + mov r0, lr + pop {r4-r6, pc} +.endfunc diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index 13ea01d4f7..6892e00774 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -67,6 +67,8 @@ int ff_pix_abs8_armv6(void *s, uint8_t *blk1, uint8_t *blk2, int ff_sse16_armv6(void *s, uint8_t *blk1, uint8_t *blk2, int line_size, int h); +int ff_pix_norm1_armv6(uint8_t *pix, int line_size); + void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx) { if (!avctx->lowres && (avctx->idct_algo == FF_IDCT_AUTO || @@ -112,4 +114,6 @@ void av_cold ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx) c->sad[1] = ff_pix_abs8_armv6; c->sse[0] = ff_sse16_armv6; + + c->pix_norm1 = ff_pix_norm1_armv6; } |