Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Sep 2012 12:48:45 +0000 (14:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Sep 2012 12:55:00 +0000 (14:55 +0200)
* qatar/master:
  mpegvideo: drop unnecessary arguments to hpel_motion()
  mpegvideo: drop 'inline' from some functions
  nellymoserdec: drop support for s16 output.
  bmpdec: only initialize palette for pal8.
  build: Properly remove object files while cleaning
  flacdsp: arm optimised lpc filter
  compat/vsnprintf: return number of bytes required on truncation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
common.mak
libavcodec/arm/flacdsp_arm.S
libavcodec/arm/flacdsp_init_arm.c
libavcodec/bmp.c
libavcodec/flacdsp.c
libavcodec/flacdsp.h
libavcodec/mpegvideo_motion.c
libavcodec/nellymoserdec.c
libavutil/arm/asm.S

diff --cc common.mak
Simple merge
index 0000000,d4441da..f8861c5
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,146 +1,146 @@@
 - * This file is part of Libav.
+ /*
+  * Copyright (c) 2012 Mans Rullgard <mans@mansr.com>
+  *
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ #include "libavutil/arm/asm.S"
+ function flac_lpc_16_1_arm
+         ldr             r12, [sp]
+         push            {r4, lr}
+         ldr             r1,  [r1]
+         subs            r12, r12, #2
+         ldr             lr,  [r0], #4
+         beq             2f
+         it              lt
+         poplt           {r4, pc}
+ 1:
+         mul             r4,  lr,  r1
+         ldm             r0,  {r2, lr}
+         add_sh          r2,  r2,  r4,  asr r3
+         mul             r4,  r2,  r1
+         subs            r12, r12, #2
+         add_sh          lr,  lr,  r4,  asr r3
+         stm             r0!, {r2, lr}
+         bgt             1b
+         it              lt
+         poplt           {r4, pc}
+ 2:
+         mul             r4,  lr,  r1
+         ldr             r2,  [r0]
+         add_sh          r2,  r2,  r4,  asr r3
+         str             r2,  [r0]
+         pop             {r4, pc}
+ endfunc
+ function flac_lpc_16_2_arm
+         ldr             r12, [sp]
+         subs            r12, r12, r2
+         it              le
+         bxle            lr
+         push            {r4-r9, lr}
+         ldm             r0!, {r6, r7}
+         ldm             r1,  {r8, r9}
+         subs            r12, r12, #1
+         beq             2f
+ 1:
+         mul             r4,  r6,  r8
+         mul             r5,  r7,  r8
+         mla             r4,  r7,  r9,  r4
+         ldm             r0,  {r6, r7}
+         add_sh          r6,  r6,  r4,  asr r3
+         mla             r5,  r6,  r9,  r5
+         add_sh          r7,  r7,  r5,  asr r3
+         stm             r0!, {r6, r7}
+         subs            r12, r12, #2
+         bgt             1b
+         it              lt
+         poplt           {r4-r9, pc}
+ 2:
+         mul             r4,  r6,  r8
+         mla             r4,  r7,  r9,  r4
+         ldr             r5,  [r0]
+         add_sh          r5,  r5,  r4,  asr r3
+         str             r5,  [r0]
+         pop             {r4-r9, pc}
+ endfunc
+ function ff_flac_lpc_16_arm, export=1
+         cmp             r2,  #2
+         blt             flac_lpc_16_1_arm
+         beq             flac_lpc_16_2_arm
+         ldr             r12, [sp]
+         subs            r12, r12, r2
+         it              le
+         bxle            lr
+         push            {r4-r9, lr}
+         subs            r12, r12, #1
+         beq             3f
+ 1:
+         sub             lr,  r2,  #2
+         mov             r4,  #0
+         mov             r5,  #0
+         ldr             r7,  [r0], #4
+         ldr             r9,  [r1], #4
+ 2:
+         mla             r4,  r7,  r9,  r4
+         ldm             r0!, {r6, r7}
+         mla             r5,  r6,  r9,  r5
+         ldm             r1!, {r8, r9}
+         mla             r4,  r6,  r8,  r4
+         subs            lr,  lr,  #2
+         mla             r5,  r7,  r8,  r5
+         bgt             2b
+         blt             6f
+         mla             r4,  r7,  r9,  r4
+         ldr             r7,  [r0], #4
+         mla             r5,  r7,  r9,  r5
+         ldr             r9,  [r1], #4
+ 6:
+         mla             r4,  r7,  r9,  r4
+         ldm             r0,  {r6, r7}
+         add_sh          r6,  r6,  r4,  asr r3
+         mla             r5,  r6,  r9,  r5
+         add_sh          r7,  r7,  r5,  asr r3
+         stm             r0!, {r6, r7}
+         sub             r0,  r0,  r2,  lsl #2
+         sub             r1,  r1,  r2,  lsl #2
+         subs            r12, r12, #2
+         bgt             1b
+         it              lt
+         poplt           {r4-r9, pc}
+ 3:
+         mov             r4,  #0
+ 4:
+         ldr             r5,  [r1], #4
+         ldr             r6,  [r0], #4
+         mla             r4,  r5,  r6,  r4
+         subs            r2,  r2,  #1
+         bgt             4b
+         ldr             r5,  [r0]
+         add_sh          r5,  r5,  r4,  asr r3
+         str             r5,  [r0]
+         pop             {r4-r9, pc}
+ endfunc
index 0000000,0530cf7..9b93942
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,32 +1,32 @@@
 - * This file is part of Libav.
+ /*
+  * Copyright (c) 2012 Mans Rullgard <mans@mansr.com>
+  *
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ #include "libavcodec/flacdsp.h"
+ #include "config.h"
+ void ff_flac_lpc_16_arm(int32_t *samples, const int coeffs[32], int order,
+                         int qlevel, int len);
+ av_cold void ff_flacdsp_init_arm(FLACDSPContext *c, enum AVSampleFormat fmt,
+                                  int bps)
+ {
+     if (bps <= 16)
+         c->lpc = ff_flac_lpc_16_arm;
+ }
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge