[SCM] libav/experimental: inline to allow constant propagation 50% faster predictor_update_filter, 1-10% faster ape decoding on core2

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 36373cde20957b621aaab4779b36ee87096e5e93
Author: Loren Merritt <lorenm at u.washington.edu>
Date:   Thu Dec 3 17:44:08 2009 +0000

    inline to allow constant propagation
    50% faster predictor_update_filter, 1-10% faster ape decoding on core2
    
    Originally committed as revision 20719 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 20ebe9e..fa8f654 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -517,7 +517,7 @@ static inline int APESIGN(int32_t x) {
     return (x < 0) - (x > 0);
 }
 
-static int predictor_update_filter(APEPredictor *p, const int decoded, const int filter, const int delayA, const int delayB, const int adaptA, const int adaptB)
+static av_always_inline int predictor_update_filter(APEPredictor *p, const int decoded, const int filter, const int delayA, const int delayB, const int adaptA, const int adaptB)
 {
     int32_t predictionA, predictionB;
 
@@ -578,17 +578,16 @@ static int predictor_update_filter(APEPredictor *p, const int decoded, const int
 
 static void predictor_decode_stereo(APEContext * ctx, int count)
 {
-    int32_t predictionA, predictionB;
     APEPredictor *p = &ctx->predictor;
     int32_t *decoded0 = ctx->decoded0;
     int32_t *decoded1 = ctx->decoded1;
 
     while (count--) {
         /* Predictor Y */
-        predictionA = predictor_update_filter(p, *decoded0, 0, YDELAYA, YDELAYB, YADAPTCOEFFSA, YADAPTCOEFFSB);
-        predictionB = predictor_update_filter(p, *decoded1, 1, XDELAYA, XDELAYB, XADAPTCOEFFSA, XADAPTCOEFFSB);
-        *(decoded0++) = predictionA;
-        *(decoded1++) = predictionB;
+        *decoded0 = predictor_update_filter(p, *decoded0, 0, YDELAYA, YDELAYB, YADAPTCOEFFSA, YADAPTCOEFFSB);
+        decoded0++;
+        *decoded1 = predictor_update_filter(p, *decoded1, 1, XDELAYA, XDELAYB, XADAPTCOEFFSA, XADAPTCOEFFSB);
+        decoded1++;
 
         /* Combined */
         p->buf++;

-- 
Libav/FFmpeg packaging