Mercurial > libavcodec.hg

changeset 11961:d7808ddcbcee libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lsp: convert variable-length arrays to fixed size Max LP order is defined to be 16, fixed-size buffers are OK.
author mru
date Sat, 26 Jun 2010 14:34:12 +0000
parents 670516285e58
children 150c7c236e78
files lsp.c lsp.h
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lsp.c	Sat Jun 26 14:34:08 2010 +0000
+++ b/lsp.c	Sat Jun 26 14:34:12 2010 +0000
@@ -90,8 +90,8 @@
 void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order)
 {
     int i;
-    int f1[lp_half_order+1]; // (3.22)
-    int f2[lp_half_order+1]; // (3.22)
+    int f1[MAX_LP_HALF_ORDER+1]; // (3.22)
+    int f2[MAX_LP_HALF_ORDER+1]; // (3.22)
 
     lsp2poly(f1, lsp  , lp_half_order);
     lsp2poly(f2, lsp+1, lp_half_order);
@@ -111,7 +111,7 @@
 
 void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd, const int16_t* lsp_prev, int lp_order)
 {
-    int16_t lsp_1st[lp_order]; // (0.15)
+    int16_t lsp_1st[MAX_LP_ORDER]; // (0.15)
     int i;
 
     /* LSP values for first subframe (3.2.5 of G.729, Equation 24)*/
--- a/lsp.h	Sat Jun 26 14:34:08 2010 +0000
+++ b/lsp.h	Sat Jun 26 14:34:12 2010 +0000
@@ -82,6 +82,7 @@
 
 
 #define MAX_LP_HALF_ORDER 8
+#define MAX_LP_ORDER      (2*MAX_LP_HALF_ORDER)
 
 /**
  * Reconstructs LPC coefficients from the line spectral pair frequencies.