mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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:
parent
f24cc1b2f1
commit
4b0e0f31bf
@ -178,11 +178,9 @@ int ff_lpc_calc_coefs(LPCContext *s,
|
||||
}
|
||||
|
||||
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(windowed_samples, blocksize, max_order, autoc);
|
||||
s->lpc_compute_autocorr(s->windowed_samples, blocksize, max_order, autoc);
|
||||
|
||||
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;
|
||||
|
||||
if (lpc_type == FF_LPC_TYPE_LEVINSON) {
|
||||
s->windowed_samples = av_mallocz((blocksize + max_order + 2) *
|
||||
sizeof(*s->windowed_samples));
|
||||
if (!s->windowed_samples)
|
||||
s->windowed_buffer = av_mallocz((blocksize + 2 + FFALIGN(max_order, 4)) *
|
||||
sizeof(*s->windowed_samples));
|
||||
if (!s->windowed_buffer)
|
||||
return AVERROR(ENOMEM);
|
||||
s->windowed_samples = s->windowed_buffer + FFALIGN(max_order, 4);
|
||||
} else {
|
||||
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_freep(&s->windowed_samples);
|
||||
av_freep(&s->windowed_buffer);
|
||||
}
|
||||
|
@ -51,6 +51,7 @@ typedef struct LPCContext {
|
||||
int blocksize;
|
||||
int max_order;
|
||||
enum FFLPCType lpc_type;
|
||||
double *windowed_buffer;
|
||||
double *windowed_samples;
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user