Store original width/height so that rv20 does not get stuck with some

[ffmpeg] / libavcodec / qcelpdec.c

diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c
index eff57cfecfc0dfa278b8f31282976f8672797944..16f9ae0be9dde704ded898cd1926611b89ac2c43 100644 (file)
--- a/libavcodec/qcelpdec.c
+++ b/libavcodec/qcelpdec.c
@@ -38,6 +38,7 @@
 #include "celp_math.h"
 #include "celp_filters.h"
 #include "acelp_vectors.h"
+#include "lsp.h"
 
 #undef NDEBUG
 #include <assert.h>
@@ -75,13 +76,6 @@ typedef struct
     uint8_t  warned_buf_mismatch_bitrate;
 } QCELPContext;
 
-/**
- * Reconstructs LPC coefficients from the line spectral pair frequencies.
- *
- * TIA/EIA/IS-733 2.4.3.3.5
- */
-void ff_celp_lspf2lpc(const double *lspf, float *lpc);
-
 /**
  * Initialize the speech codec according to the specification.
  *
@@ -249,7 +243,7 @@ static void decode_gain_and_index(QCELPContext  *q,
             gain[2] =     gain[1];
             gain[1] = 0.6*gain[0] + 0.4*gain[1];
         }
-    }else
+    }else if (q->bitrate != SILENCE)
     {
         if(q->bitrate == RATE_OCTAVE)
         {
@@ -411,31 +405,6 @@ static void compute_svector(QCELPContext *q, const float *gain,
     }
 }
 
-/**
- * Compute the gain control
- *
- * @param v_in gain-controlled vector
- * @param v_ref vector to control gain of
- *
- * @return gain control
- *
- * FIXME: If v_ref is a zero vector, it energy is zero
- *        and the behavior of the gain control is
- *        undefined in the specs.
- *
- * TIA/EIA/IS-733 2.4.8.3-2/3/4/5, 2.4.8.6
- */
-static float compute_gain_ctrl(const float *v_ref, const float *v_in, const int len)
-{
-    float scalefactor = ff_dot_productf(v_in, v_in, len);
-
-    if(scalefactor)
-        scalefactor = sqrt(ff_dot_productf(v_ref, v_ref, len) / scalefactor);
-    else
-        ff_log_missing_feature(NULL, "Zero energy for gain control", 1);
-    return scalefactor;
-}
-
 /**
  * Apply generic gain control.
  *
@@ -448,15 +417,13 @@ static float compute_gain_ctrl(const float *v_ref, const float *v_in, const int
 static void apply_gain_ctrl(float *v_out, const float *v_ref,
                             const float *v_in)
 {
-    int   i, j, len;
-    float scalefactor;
+    int i;
 
-    for(i=0, j=0; i<4; i++)
-    {
-        scalefactor = compute_gain_ctrl(v_ref + j, v_in + j, 40);
-        for(len=j+40; j<len; j++)
-            v_out[j] = scalefactor * v_in[j];
-    }
+    for (i = 0; i < 160; i += 40)
+        ff_scale_vector_to_given_sum_of_squares(v_out + i, v_in + i,
+                                                ff_dot_productf(v_ref + i,
+                                                                v_ref + i, 40),
+                                                40);
 }
 
 /**
@@ -597,26 +564,26 @@ static void apply_pitch_filters(QCELPContext *q, float *cdn_vector)
  * @param lspf line spectral pair frequencies
  * @param lpc linear predictive coding coefficients
  *
- * @note: bandwith_expansion_coeff could be precalculated into a table
+ * @note: bandwidth_expansion_coeff could be precalculated into a table
  *        but it seems to be slower on x86
  *
  * TIA/EIA/IS-733 2.4.3.3.5
  */
 static void lspf2lpc(const float *lspf, float *lpc)
 {
-    double lsf[10];
-    double bandwith_expansion_coeff = QCELP_BANDWITH_EXPANSION_COEFF;
+    double lsp[10];
+    double bandwidth_expansion_coeff = QCELP_BANDWIDTH_EXPANSION_COEFF;
     int   i;
 
     for (i=0; i<10; i++)
-        lsf[i] = cos(M_PI * lspf[i]);
+        lsp[i] = cos(M_PI * lspf[i]);
 
-    ff_celp_lspf2lpc(lsf, lpc);
+    ff_acelp_lspd2lpc(lsp, lpc, 5);
 
     for (i=0; i<10; i++)
     {
-        lpc[i] *= bandwith_expansion_coeff;
-        bandwith_expansion_coeff *= QCELP_BANDWITH_EXPANSION_COEFF;
+        lpc[i] *= bandwidth_expansion_coeff;
+        bandwidth_expansion_coeff *= QCELP_BANDWIDTH_EXPANSION_COEFF;
     }
 }
 
@@ -716,7 +683,7 @@ static qcelp_packet_rate determine_bitrate(AVCodecContext *avctx, const int buf_
     if(bitrate == SILENCE)
     {
         //FIXME: Remove experimental warning when tested with samples.
-        ff_log_ask_for_sample(avctx, "'Blank frame handling is experimental.");
+        av_log_ask_for_sample(avctx, "'Blank frame handling is experimental.");
     }
     return bitrate;
 }