Skip to content

F
ffmpeg
Commit 0b5adc35 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/adxenc: fix rounding 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 6b0ab561
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
libavcodec/adxenc.c
View file @ 0b5adc35
...@@ -81,7 +81,7 @@ static void adx_encode(ADXContext *c, uint8_t *adx, const int16_t *wav, ...@@ -81,7 +81,7 @@ static void adx_encode(ADXContext *c, uint8_t *adx, const int16_t *wav,
for (i = 0, j = 0; j < 32; i += channels, j++) { for (i = 0, j = 0; j < 32; i += channels, j++) {
d = ((wav[i] << COEFF_BITS) - c->coeff[0] * s1 - c->coeff[1] * s2) >> COEFF_BITS; d = ((wav[i] << COEFF_BITS) - c->coeff[0] * s1 - c->coeff[1] * s2) >> COEFF_BITS;
d = av_clip(d / scale, -8, 7); d = av_clip(ROUNDED_DIV(d, scale), -8, 7);
put_sbits(&pb, 4, d); put_sbits(&pb, 4, d);
......
tests/ref/acodec/adpcm-adx
View file @ 0b5adc35
d82a87942d6500adb4d07d21cbcbdb78 *tests/data/fate/acodec-adpcm-adx.adx d7ec7d52a2f5c91464812d031b07cc1d *tests/data/fate/acodec-adpcm-adx.adx
297720 tests/data/fate/acodec-adpcm-adx.adx 297720 tests/data/fate/acodec-adpcm-adx.adx
4e78a1153eb8fc4dfc050836f46b62f8 *tests/data/fate/acodec-adpcm-adx.out.wav 5b5a436ec9d528d6eb0bebaf667521b0 *tests/data/fate/acodec-adpcm-adx.out.wav
stddev: 3096.24 PSNR: 26.51 MAXDIFF:53110 bytes: 1058400/ 1058432 stddev: 2549.93 PSNR: 28.20 MAXDIFF:57514 bytes: 1058400/ 1058432
tests/ref/acodec/adpcm-adx-trellis
View file @ 0b5adc35
d82a87942d6500adb4d07d21cbcbdb78 *tests/data/fate/acodec-adpcm-adx-trellis.adx d7ec7d52a2f5c91464812d031b07cc1d *tests/data/fate/acodec-adpcm-adx-trellis.adx
297720 tests/data/fate/acodec-adpcm-adx-trellis.adx 297720 tests/data/fate/acodec-adpcm-adx-trellis.adx
4e78a1153eb8fc4dfc050836f46b62f8 *tests/data/fate/acodec-adpcm-adx-trellis.out.wav 5b5a436ec9d528d6eb0bebaf667521b0 *tests/data/fate/acodec-adpcm-adx-trellis.out.wav
stddev: 3096.24 PSNR: 26.51 MAXDIFF:53110 bytes: 1058400/ 1058432 stddev: 2549.93 PSNR: 28.20 MAXDIFF:57514 bytes: 1058400/ 1058432
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment