diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-04-16 14:49:10 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-04-16 14:49:10 +0000 |
| commit | dcafb28d019139ad89459e5adebd5295dd8fecb6 (patch) | |
| tree | b89ecbac12bd892f0e4a84bfde25d0fea8c1aeb5 | |
| parent | 6fab025d300532bca1fb500b7bbd1e213b6a9359 (diff) | |
| download | ffmpeg-dcafb28d019139ad89459e5adebd5295dd8fecb6.tar.gz | |
do the -1 outside of the transform
Originally committed as revision 12852 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/nellymoserdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 204910d2c1..9324df404e 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -120,8 +120,8 @@ static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float * top = NELLY_BUF_LEN-1; while (bot < NELLY_BUF_LEN/2) { - audio[bot] = (- a_in[bot]*sine_window[bot]-state[bot]*sine_window[top])/s->scale_bias + s->add_bias; - audio[top] = (-state[bot]*sine_window[bot]- a_in[top]*sine_window[top])/s->scale_bias + s->add_bias; + audio[bot] = ( a_in[bot]*sine_window[bot]+state[bot]*sine_window[top])/s->scale_bias + s->add_bias; + audio[top] = (state[bot]*sine_window[bot]+ a_in[top]*sine_window[top])/s->scale_bias + s->add_bias; state[bot] = a_in[bot + NELLY_BUF_LEN]; bot++; @@ -299,11 +299,11 @@ void nelly_decode_block(NellyMoserDecodeContext *s, const unsigned char block[NE for (j = 0; j < NELLY_FILL_LEN; j++) { if (bits[j] <= 0) { aptr[j] = M_SQRT1_2*pows[j]; - if (av_random(&s->random_state) & 1) + if (!(av_random(&s->random_state) & 1)) aptr[j] *= -1.0; } else { v = get_bits(&s->gb, bits[j]); - aptr[j] = dequantization_table[(1<<bits[j])-1+v]*pows[j]; + aptr[j] = -dequantization_table[(1<<bits[j])-1+v]*pows[j]; } } memset(&aptr[NELLY_FILL_LEN], 0, |