RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

resample: replace VLA with malloc/free 

Originally committed as revision 24142 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-07-09 16:05:58 +00:00
parent a426016cfc
commit 080ce9071d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/resample2.c
View File

@ -94,12 +94,17 @@ static double bessel(double x){
* @param factor resampling factor * @param factor resampling factor
* @param scale wanted sum of coefficients for each filter * @param scale wanted sum of coefficients for each filter
* @param type 0->cubic, 1->blackman nuttall windowed sinc, 2..16->kaiser windowed sinc beta=2..16 * @param type 0->cubic, 1->blackman nuttall windowed sinc, 2..16->kaiser windowed sinc beta=2..16
* @return 0 on success, negative on error
*/ */
static void build_filter(FELEM *filter, double factor, int tap_count, int phase_count, int scale, int type){ static int build_filter(FELEM *filter, double factor, int tap_count, int phase_count, int scale, int type){
int ph, i; int ph, i;
double x, y, w, tab[tap_count]; double x, y, w;
double *tab = av_malloc(tap_count * sizeof(*tab));
const int center= (tap_count-1)/2; const int center= (tap_count-1)/2;
if (!tab)
return AVERROR(ENOMEM);
/* if upsampling, only need to interpolate, no filter */ /* if upsampling, only need to interpolate, no filter */
if (factor > 1.0) if (factor > 1.0)
factor = 1.0; factor = 1.0;
@ -176,6 +181,9 @@ static void build_filter(FELEM *filter, double factor, int tap_count, int phase_
} }
} }
#endif #endif
av_free(tab);
return 0;
} }
AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size, int phase_shift, int linear, double cutoff){ AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size, int phase_shift, int linear, double cutoff){
@ -194,7 +202,8 @@ AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size,
c->filter_bank= av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM)); c->filter_bank= av_mallocz(c->filter_length*(phase_count+1)*sizeof(FELEM));
if (!c->filter_bank) if (!c->filter_bank)
goto error; goto error;
build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<<FILTER_SHIFT, WINDOW_TYPE); if (build_filter(c->filter_bank, factor, c->filter_length, phase_count, 1<<FILTER_SHIFT, WINDOW_TYPE))
goto error;
memcpy(&c->filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM)); memcpy(&c->filter_bank[c->filter_length*phase_count+1], c->filter_bank, (c->filter_length-1)*sizeof(FELEM));
c->filter_bank[c->filter_length*phase_count]= c->filter_bank[c->filter_length - 1]; c->filter_bank[c->filter_length*phase_count]= c->filter_bank[c->filter_length - 1];
@ -204,6 +213,7 @@ AVResampleContext *av_resample_init(int out_rate, int in_rate, int filter_size,
return c; return c;
error: error:
av_free(c->filter_bank);
av_free(c); av_free(c);
return NULL; return NULL;
} }