RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-11 17:55:21 +00:00
Code Issues Projects Releases Wiki Activity

SIPR: kill variable-length arrays

Browse Source 
Two of these are in fact constant size, so use the constant instead of
a variable in the declarations.  The remaining one is small enough
that always using the maximum size is acceptable.

Originally committed as revision 21183 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-01-13 03:11:02 +00:00
parent 0cd73b6c30
commit f3da24c4c3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/sipr.c
View File

@ -46,6 +46,8 @@
/** Subframe size for all modes except 16k */ /** Subframe size for all modes except 16k */
#define SUBFR_SIZE 48 #define SUBFR_SIZE 48
#define MAX_SUBFRAME_COUNT 5
#include "siprdata.h" #include "siprdata.h"
typedef enum { typedef enum {
@ -233,8 +235,8 @@ static void decode_parameters(SiprParameters* parms, GetBitContext *pgb,
static void lsp2lpc_sipr(const double *lsp, float *Az) static void lsp2lpc_sipr(const double *lsp, float *Az)
{ {
int lp_half_order = LP_FILTER_ORDER >> 1; int lp_half_order = LP_FILTER_ORDER >> 1;
double buf[lp_half_order + 1]; double buf[(LP_FILTER_ORDER >> 1) + 1];
double pa[lp_half_order + 1]; double pa[(LP_FILTER_ORDER >> 1) + 1];
double *qa = buf + 1; double *qa = buf + 1;
int i,j; int i,j;
@ -409,7 +411,7 @@ static void decode_frame(SiprContext *ctx, SiprParameters *params,
{ {
int i, j; int i, j;
int frame_size = ctx->m.subframe_count * SUBFR_SIZE; int frame_size = ctx->m.subframe_count * SUBFR_SIZE;
float Az[LP_FILTER_ORDER * ctx->m.subframe_count]; float Az[LP_FILTER_ORDER * MAX_SUBFRAME_COUNT];
float *excitation; float *excitation;
float ir_buf[SUBFR_SIZE + LP_FILTER_ORDER]; float ir_buf[SUBFR_SIZE + LP_FILTER_ORDER];
float lsf_new[LP_FILTER_ORDER]; float lsf_new[LP_FILTER_ORDER];