diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-23 14:23:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-23 14:33:33 +0200 |
| commit | 104f42e69485557a7d603047e1d29c44bbd12562 (patch) | |
| tree | f70179c1693b6fe212ac4090f49ea1ed843f92d4 /libavcodec/lpc.c | |
| parent | c2271fa7f9a88afb374300c7320b57b870969926 (diff) | |
| parent | 7b44061f4be1075eefbc2eec649f38dd0dbfcc82 (diff) | |
| download | ffmpeg-104f42e69485557a7d603047e1d29c44bbd12562.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/APIchanges: add an entry for codec descriptors.
vorbisenc: set AVCodecContext.bit_rate to 0
vorbisenc: fix quality parameter
FATE: add ALAC encoding tests
lpc: fix alignment of windowed samples for odd maximum LPC order
alacenc: use s16p sample format as input
alacenc: remove unneeded sample_fmt check
alacenc: fix max_frame_size calculation for the final frame
adpcm_swf: Use correct sample offsets when using trellis.
rtmp: support strict rtmp servers
mjpegdec: support AVRn interlaced
x86: remove FASTDIV inline asm
Conflicts:
doc/APIchanges
libavcodec/mjpegdec.c
libavcodec/vorbisenc.c
libavutil/x86/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lpc.c')
| -rw-r--r-- | libavcodec/lpc.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 3e5e3d63ad..ac8984a583 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -179,11 +179,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); @@ -252,10 +250,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; } @@ -271,5 +270,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); } |