virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

Remove VLA in ff_kbd_window_init, limit window size to 1024

Browse Source 
Originally committed as revision 23755 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård
2010-06-24 09:42:34 +00:00
parent 796cea09b6
commit dd93649b71
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/fft.h
View File

@ -150,11 +150,16 @@ static inline void ff_mdct_calc(FFTContext *s, FFTSample *output,
s->mdct_calc(s, output, input); s->mdct_calc(s, output, input);
} }
/**
* Maximum window size for ff_kbd_window_init.
*/
#define FF_KBD_WINDOW_MAX 1024
/** /**
* Generate a Kaiser-Bessel Derived Window. * Generate a Kaiser-Bessel Derived Window.
* @param window pointer to half window * @param window pointer to half window
* @param alpha determines window shape * @param alpha determines window shape
* @param n size of half window * @param n size of half window, max FF_KBD_WINDOW_MAX
*/ */
void ff_kbd_window_init(float *window, float alpha, int n); void ff_kbd_window_init(float *window, float alpha, int n);

4
libavcodec/mdct.c
View File

@ -36,9 +36,11 @@ av_cold void ff_kbd_window_init(float *window, float alpha, int n)
{ {
int i, j; int i, j;
double sum = 0.0, bessel, tmp; double sum = 0.0, bessel, tmp;
double local_window[n]; double local_window[FF_KBD_WINDOW_MAX];
double alpha2 = (alpha * M_PI / n) * (alpha * M_PI / n); double alpha2 = (alpha * M_PI / n) * (alpha * M_PI / n);
assert(n <= FF_KBD_WINDOW_MAX);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
tmp = i * (n - i) * alpha2; tmp = i * (n - i) * alpha2;
bessel = 1.0; bessel = 1.0;