correctly interleave audio and video according to specs

[ffmpeg] / libavcodec / lsp.c

diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c
index a4d851be763f6d767c3a3249c5547da65ce5be12..f57f62135009e4715036d12ccb4794da1a04138b 100644 (file)
--- a/libavcodec/lsp.c
+++ b/libavcodec/lsp.c
@@ -26,7 +26,7 @@
 #define FRAC_BITS 14
 #include "mathops.h"
 #include "lsp.h"
-#include "acelp_math.h"
+#include "celp_math.h"
 
 void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, int lsfq_max, int lp_order)
 {
@@ -72,7 +72,7 @@ static void lsp2poly(int* f, const int16_t* lsp, int lp_half_order)
     {
         f[i] = f[i-2];
         for(j=i; j>1; j--)
-            f[j] -= MULL(f[j-1], lsp[2*i-2]) - f[j-2]; // (3.22) * (0.15) * 2 -> (3.22)
+            f[j] -= MULL(f[j-1], lsp[2*i-2], FRAC_BITS) - f[j-2];
 
         f[1] -= lsp[2*i-2] << 8;
     }
@@ -96,7 +96,7 @@ void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order)
 
         ff1 += 1 << 10; // for rounding
         lp[i]    = (ff1 + ff2) >> 11; // divide by 2 and (3.22) -> (3.12)
-        lp[lp_order + 1 - i] = (ff1 - ff2) >> 11; // divide by 2 and (3.22) -> (3.12)
+        lp[(lp_half_order << 1) + 1 - i] = (ff1 - ff2) >> 11; // divide by 2 and (3.22) -> (3.12)
     }
 }