RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-12 10:15:22 +00:00
Code Issues Projects Releases Wiki Activity

swresample/resample: fix rounding errors with filter_size=1 and phase_shift=0

Browse Source 
Depending on input chunk size noticable corrpution was hearable, here is an
example command line:

ffplay -f lavfi -i "sine=440:r=8000:samples_per_frame=32,aresample=24000:filter_size=1:phase_shift=0"

Fix this by rounding the fixed point fractions up instead of down.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2024-02-27 10:31:31 +01:00
parent 0b98f28c46
commit 7b1b9bb31f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libswresample/resample.c
View File

@ -357,8 +357,8 @@ static int multiple_resample(ResampleContext *c, AudioData *dst, int dst_size, A
*consumed = 0; *consumed = 0;
if (c->filter_length == 1 && c->phase_count == 1) { if (c->filter_length == 1 && c->phase_count == 1) {
int64_t index2= (1LL<<32)*c->frac/c->src_incr + (1LL<<32)*c->index; int64_t index2= (1LL<<32)*c->frac/c->src_incr + (1LL<<32)*c->index + 1;
int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr; int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr + 1;
int new_size = (src_size * (int64_t)c->src_incr - c->frac + c->dst_incr - 1) / c->dst_incr; int new_size = (src_size * (int64_t)c->src_incr - c->frac + c->dst_incr - 1) / c->dst_incr;
dst_size = FFMAX(FFMIN(dst_size, new_size), 0); dst_size = FFMAX(FFMIN(dst_size, new_size), 0);

4
tests/fate/libswresample.mak
View File

@ -347,13 +347,13 @@ endef
fate-swr-resample_nn-fltp-44100-8000: CMP_TARGET = 591.03 fate-swr-resample_nn-fltp-44100-8000: CMP_TARGET = 591.03
fate-swr-resample_nn-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20486 fate-swr-resample_nn-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
fate-swr-resample_nn-fltp-8000-44100: CMP_TARGET = 3163.32 fate-swr-resample_nn-fltp-8000-44100: CMP_TARGET = 3156.61
fate-swr-resample_nn-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20480 fate-swr-resample_nn-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
fate-swr-resample_nn-s16p-44100-8000: CMP_TARGET = 590.98 fate-swr-resample_nn-s16p-44100-8000: CMP_TARGET = 590.98
fate-swr-resample_nn-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20486 fate-swr-resample_nn-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20486
fate-swr-resample_nn-s16p-8000-44100: CMP_TARGET = 3163.39 fate-swr-resample_nn-s16p-8000-44100: CMP_TARGET = 3156.61
fate-swr-resample_nn-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20480 fate-swr-resample_nn-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20480
define ARESAMPLE_ASYNC define ARESAMPLE_ASYNC