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

lpc: fix alignment of windowed samples for odd maximum LPC order 

Fixes crash on x86 due to alignment requirements for w_data in
lpc_apply_welch_window_sse2().
This commit is contained in:
Justin Ruggles 2012-08-21 12:29:11 -04:00
parent f24cc1b2f1
commit 4b0e0f31bf
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/lpc.c
View File

@ -178,11 +178,9 @@ int ff_lpc_calc_coefs(LPCContext *s,
} }
if (lpc_type == FF_LPC_TYPE_LEVINSON) { if (lpc_type == FF_LPC_TYPE_LEVINSON) {
double *windowed_samples = s->windowed_samples + max_order; s->lpc_apply_welch_window(samples, blocksize, s->windowed_samples);
s->lpc_apply_welch_window(samples, blocksize, windowed_samples); s->lpc_compute_autocorr(s->windowed_samples, blocksize, max_order, autoc);
s->lpc_compute_autocorr(windowed_samples, blocksize, max_order, autoc);
compute_lpc_coefs(autoc, max_order, &lpc[0][0], MAX_LPC_ORDER, 0, 1); compute_lpc_coefs(autoc, max_order, &lpc[0][0], MAX_LPC_ORDER, 0, 1);
@ -248,10 +246,11 @@ av_cold int ff_lpc_init(LPCContext *s, int blocksize, int max_order,
s->lpc_type = lpc_type; s->lpc_type = lpc_type;
if (lpc_type == FF_LPC_TYPE_LEVINSON) { if (lpc_type == FF_LPC_TYPE_LEVINSON) {
s->windowed_samples = av_mallocz((blocksize + max_order + 2) * s->windowed_buffer = av_mallocz((blocksize + 2 + FFALIGN(max_order, 4)) *
sizeof(*s->windowed_samples)); sizeof(*s->windowed_samples));
if (!s->windowed_samples) if (!s->windowed_buffer)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->windowed_samples = s->windowed_buffer + FFALIGN(max_order, 4);
} else { } else {
s->windowed_samples = NULL; s->windowed_samples = NULL;
} }
@ -267,5 +266,5 @@ av_cold int ff_lpc_init(LPCContext *s, int blocksize, int max_order,
av_cold void ff_lpc_end(LPCContext *s) av_cold void ff_lpc_end(LPCContext *s)
{ {
av_freep(&s->windowed_samples); av_freep(&s->windowed_buffer);
} }

1
libavcodec/lpc.h
View File

@ -51,6 +51,7 @@ typedef struct LPCContext {
int blocksize; int blocksize;
int max_order; int max_order;
enum FFLPCType lpc_type; enum FFLPCType lpc_type;
double *windowed_buffer;
double *windowed_samples; double *windowed_samples;
/** /**