From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 13 Aug 2012 13:18:47 +0000 (+0200)
Subject: g723_1dec: inline normalize_bits() in scale vector and optimize it.
X-Git-Tag: android-x86-4.4-r1~10100
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=603221ebd03348c2cabe9516c60bb6ef183a3880;p=android-x86%2Fexternal-ffmpeg.git

g723_1dec: inline normalize_bits() in scale vector and optimize it.

many branches and cases of scale_vector are irrelevant for the case here
and by inlining they can be reliably removed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
index ae7379917e..72151b43d9 100644
--- a/libavcodec/g723_1.c
+++ b/libavcodec/g723_1.c
@@ -257,7 +257,8 @@ static int scale_vector(int16_t *dst, const int16_t *vector, int length)
     for (i = 0; i < length; i++)
         max |= FFABS(vector[i]);
 
-    bits  = normalize_bits(max, 15);
+    bits= 14 - av_log2_16bit(max);
+    bits= FFMAX(bits, 0);
 
     for (i = 0; i < length; i++)
         dst[i] = vector[i] << bits >> 3;