[SCM] libav/experimental: Replace log2f(10) with a constant

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:00:42 UTC 2013


The following commit has been merged in the experimental branch:
commit e4a35244fac4171a3d3c60a5bac465b98fe0444b
Author: Måns Rullgård <mans at mansr.com>
Date:   Sat Feb 20 20:13:48 2010 +0000

    Replace log2f(10) with a constant
    
    Originally committed as revision 21924 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/acelp_pitch_delay.c b/libavcodec/acelp_pitch_delay.c
index c3e2409..cddf726 100644
--- a/libavcodec/acelp_pitch_delay.c
+++ b/libavcodec/acelp_pitch_delay.c
@@ -128,7 +128,7 @@ float ff_amr_set_fixed_gain(float fixed_gain_factor, float fixed_mean_energy,
     // ^g_c = ^gamma_gc * 100.05 (predicted dB + mean dB - dB of fixed vector)
     // Note 10^(0.05 * -10log(average x2)) = 1/sqrt((average x2)).
     float val = fixed_gain_factor *
-        exp2f(log2f(10.0) * 0.05 *
+        exp2f(M_LOG2_10 * 0.05 *
               (ff_dot_productf(pred_table, prediction_error, 4) +
                energy_mean)) /
         sqrtf(fixed_mean_energy);
diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h
index 29b13f7..4cc3b49 100644
--- a/libavutil/mathematics.h
+++ b/libavutil/mathematics.h
@@ -35,6 +35,9 @@
 #ifndef M_LN10
 #define M_LN10         2.30258509299404568402  /* log_e 10 */
 #endif
+#ifndef M_LOG2_10
+#define M_LOG2_10      3.32192809488736218171  /* log_2 10 */
+#endif
 #ifndef M_PI
 #define M_PI           3.14159265358979323846  /* pi */
 #endif

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list