[SCM] libav/experimental: ARMv6 optimised pix_abs8

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d2578ff9f1eeec2b31a807d03af5efed2669f71c
Author: Måns Rullgård <mans at mansr.com>
Date:   Tue Feb 9 16:13:34 2010 +0000

    ARMv6 optimised pix_abs8
    
    Originally committed as revision 21700 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S
index 5f4f5e4..2efa3d5 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 83c1ea8..972e743 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;
 }

-- 
Libav/FFmpeg packaging