aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-05-25 12:17:02 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-05-25 12:17:02 +0000
commit4cab1e491b69fa45f4b60f6259cc3340f51cdbd1 (patch)
tree44925dab70f3ac1765136618da234d3eeccd663c
parent34e82167f34c11092cea6fcbbddb1995e49b1569 (diff)
downloadffmpeg-4cab1e491b69fa45f4b60f6259cc3340f51cdbd1.tar.gz
Move a DECLARE_ALIGNED_16 variable in the Nellymoser encoder from the stack
into the context to avoid issues when stack variables can not be aligned reliably. Originally committed as revision 18940 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/nellymoserenc.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index 52ee2bc03b..c9f93dbcb8 100644
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -54,6 +54,7 @@ typedef struct NellyMoserEncodeContext {
DSPContext dsp;
MDCTContext mdct_ctx;
DECLARE_ALIGNED_16(float, mdct_out[NELLY_SAMPLES]);
+ DECLARE_ALIGNED_16(float, in_buff[NELLY_SAMPLES]);
DECLARE_ALIGNED_16(float, buf[2][3 * NELLY_BUF_LEN]); ///< sample buffer
float (*opt )[NELLY_BANDS];
uint8_t (*path)[NELLY_BANDS];
@@ -111,13 +112,11 @@ static const uint8_t quant_lut_offset[8] = { 0, 0, 1, 4, 11, 32, 81, 230 };
void apply_mdct(NellyMoserEncodeContext *s)
{
- DECLARE_ALIGNED_16(float, in_buff[NELLY_SAMPLES]);
-
- memcpy(in_buff, s->buf[s->bufsel], NELLY_BUF_LEN * sizeof(float));
- s->dsp.vector_fmul(in_buff, ff_sine_128, NELLY_BUF_LEN);
- s->dsp.vector_fmul_reverse(in_buff + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128,
+ memcpy(s->in_buff, s->buf[s->bufsel], NELLY_BUF_LEN * sizeof(float));
+ s->dsp.vector_fmul(s->in_buff, ff_sine_128, NELLY_BUF_LEN);
+ s->dsp.vector_fmul_reverse(s->in_buff + NELLY_BUF_LEN, s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128,
NELLY_BUF_LEN);
- ff_mdct_calc(&s->mdct_ctx, s->mdct_out, in_buff);
+ ff_mdct_calc(&s->mdct_ctx, s->mdct_out, s->in_buff);
s->dsp.vector_fmul(s->buf[s->bufsel] + NELLY_BUF_LEN, ff_sine_128, NELLY_BUF_LEN);
s->dsp.vector_fmul_reverse(s->buf[s->bufsel] + 2 * NELLY_BUF_LEN, s->buf[1 - s->bufsel], ff_sine_128,