On Wed, Aug 22, 2012 at 01:40:31PM -0400, Justin Ruggles wrote:
> Fixes crash on x86 due to alignment requirements for w_data in
> lpc_apply_welch_window_sse2().
> ---
> libavcodec/lpc.c | 15 +++++++--------
> libavcodec/lpc.h | 1 +
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c
> index 6ce5dde..cc3ce44 100644
> --- a/libavcodec/lpc.c
> +++ b/libavcodec/lpc.c
> @@ -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);
> }
> diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h
> index 1775374..cbee46f 100644
> --- a/libavcodec/lpc.h
> +++ b/libavcodec/lpc.h
> @@ -51,6 +51,7 @@ typedef struct LPCContext {
> int blocksize;
> int max_order;
> enum FFLPCType lpc_type;
> + double *windowed_buffer;
> double *windowed_samples;
>
> /**
> --
LGTM
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
