mpeg12: propagate more real return values through chunk decode error return and fix...

[ffmpeg] / libavcodec / lsp.c

diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c
index d9ddd7d08182039aff951b19aca145b91857c5d2..834346bc25eb65e14f0428116dd11016e543c800 100644 (file)
--- a/libavcodec/lsp.c
+++ b/libavcodec/lsp.c
@@ -74,9 +74,9 @@ void ff_acelp_lsf2lspd(double *lsp, const float *lsf, int lp_order)
 }
 
 /**
- * \brief decodes polynomial coefficients from LSP
- * \param f [out] decoded polynomial coefficients (-0x20000000 <= (3.22) <= 0x1fffffff)
- * \param lsp LSP coefficients (-0x8000 <= (0.15) <= 0x7fff)
+ * @brief decodes polynomial coefficients from LSP
+ * @param f [out] decoded polynomial coefficients (-0x20000000 <= (3.22) <= 0x1fffffff)
+ * @param lsp LSP coefficients (-0x8000 <= (0.15) <= 0x7fff)
  */
 static void lsp2poly(int* f, const int16_t* lsp, int lp_half_order)
 {
@@ -120,8 +120,8 @@ void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order)
 void ff_amrwb_lsp2lpc(const double *lsp, float *lp, int lp_order)
 {
     int lp_half_order = lp_order >> 1;
-    double buf[lp_half_order + 1];
-    double pa[lp_half_order + 1];
+    double buf[MAX_LP_HALF_ORDER + 1];
+    double pa[MAX_LP_HALF_ORDER + 1];
     double *qa = buf + 1;
     int i,j;
 
@@ -150,11 +150,7 @@ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd
 
     /* LSP values for first subframe (3.2.5 of G.729, Equation 24)*/
     for(i=0; i<lp_order; i++)
-#ifdef G729_BITEXACT
-        lsp_1st[i] = (lsp_2nd[i] >> 1) + (lsp_prev[i] >> 1);
-#else
         lsp_1st[i] = (lsp_2nd[i] + lsp_prev[i]) >> 1;
-#endif
 
     ff_acelp_lsp2lpc(lp_1st, lsp_1st, lp_order >> 1);