Lossless jpeg expects and uses BGRA not RGB32 (this probably caused a problem on

[ffmpeg] / libavcodec / lsp.c

diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c
index 09c9259c70e23dcc535bb8db0cf0d081950723e5..003ffbc63440677a7b176b73f16f9556627a3858 100644 (file)
--- a/libavcodec/lsp.c
+++ b/libavcodec/lsp.c
@@ -47,7 +47,7 @@ void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, in
     lsfq[lp_order-1] = FFMIN(lsfq[lp_order-1], lsfq_max);//Is warning required ?
 }
 
-void ff_set_min_dist_lsf(float *lsf, float min_spacing, int size)
+void ff_set_min_dist_lsf(float *lsf, double min_spacing, int size)
 {
     int i;
     float prev = 0.0;
@@ -128,17 +128,7 @@ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd
     ff_acelp_lsp2lpc(lp_2nd, lsp_2nd, lp_order >> 1);
 }
 
-/**
- * Computes the Pa / (1 + z(-1)) or Qa / (1 - z(-1)) coefficients
- * needed for LSP to LPC conversion.
- * We only need to calculate the 6 first elements of the polynomial.
- *
- * @param lsp line spectral pairs in cosine domain
- * @param f [out] polynomial input/output as a vector
- *
- * TIA/EIA/IS-733 2.4.3.3.5-1/2
- */
-static void lsp2polyf(const double *lsp, double *f, int lp_half_order)
+void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order)
 {
     int i, j;
 
@@ -155,20 +145,30 @@ static void lsp2polyf(const double *lsp, double *f, int lp_half_order)
     }
 }
 
-void ff_acelp_lspd2lpc(const double *lsp, float *lpc)
+void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order)
 {
-    double pa[6], qa[6];
-    int   i;
+    double pa[MAX_LP_HALF_ORDER+1], qa[MAX_LP_HALF_ORDER+1];
+    float *lpc2 = lpc + (lp_half_order << 1) - 1;
 
-    lsp2polyf(lsp,     pa, 5);
-    lsp2polyf(lsp + 1, qa, 5);
+    assert(lp_half_order <= MAX_LP_HALF_ORDER);
 
-    for (i=4; i>=0; i--)
-    {
-        double paf = pa[i+1] + pa[i];
-        double qaf = qa[i+1] - qa[i];
+    ff_lsp2polyf(lsp,     pa, lp_half_order);
+    ff_lsp2polyf(lsp + 1, qa, lp_half_order);
 
-        lpc[i  ] = 0.5*(paf+qaf);
-        lpc[9-i] = 0.5*(paf-qaf);
+    while (lp_half_order--) {
+        double paf = pa[lp_half_order+1] + pa[lp_half_order];
+        double qaf = qa[lp_half_order+1] - qa[lp_half_order];
+
+        lpc [ lp_half_order] = 0.5*(paf+qaf);
+        lpc2[-lp_half_order] = 0.5*(paf-qaf);
     }
 }
+
+void ff_sort_nearly_sorted_floats(float *vals, int len)
+{
+    int i,j;
+
+    for (i = 0; i < len - 1; i++)
+        for (j = i; j >= 0 && vals[j] > vals[j+1]; j--)
+            FFSWAP(float, vals[j], vals[j+1]);
+}