diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-11 16:49:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-11 18:41:01 +0100 |
| commit | 3de8521667e38613bc0214f8959665c87d471d49 (patch) | |
| tree | da027f00be0b24c496d6ef6d766fd898eae83ab1 | |
| parent | edf5e88eac83807f6f80b1d18c57810c31c4d6fa (diff) | |
| download | ffmpeg-3de8521667e38613bc0214f8959665c87d471d49.tar.gz | |
swresample/resample: increase precision for compensation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 351e625d60165be67c362af6e96ead6c9262623f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libswresample/resample.c | 4 | ||||
| -rw-r--r-- | tests/fate/libswresample.mak | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libswresample/resample.c b/libswresample/resample.c index 554fd7b5f7..8f3eb41ad9 100644 --- a/libswresample/resample.c +++ b/libswresample/resample.c @@ -231,6 +231,10 @@ static ResampleContext *resample_init(ResampleContext *c, int out_rate, int in_r c->compensation_distance= 0; if(!av_reduce(&c->src_incr, &c->dst_incr, out_rate, in_rate * (int64_t)phase_count, INT32_MAX/2)) goto error; + while (c->dst_incr < (1<<20) && c->src_incr < (1<<20)) { + c->dst_incr *= 2; + c->src_incr *= 2; + } c->ideal_dst_incr = c->dst_incr; c->dst_incr_div = c->dst_incr / c->src_incr; c->dst_incr_mod = c->dst_incr % c->src_incr; diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak index e48170dc49..064c0f614f 100644 --- a/tests/fate/libswresample.mak +++ b/tests/fate/libswresample.mak @@ -366,16 +366,16 @@ fate-swr-resample_async-$(3)-$(1)-$(2): FUZZ = 0.1 fate-swr-resample_async-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav endef -fate-swr-resample_async-fltp-44100-8000: CMP_TARGET = 4031.48 +fate-swr-resample_async-fltp-44100-8000: CMP_TARGET = 4020.62 fate-swr-resample_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20310 -fate-swr-resample_async-fltp-8000-44100: CMP_TARGET = 11185.34 +fate-swr-resample_async-fltp-8000-44100: CMP_TARGET = 11186.69 fate-swr-resample_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20344 -fate-swr-resample_async-s16p-44100-8000: CMP_TARGET = 4031.59 +fate-swr-resample_async-s16p-44100-8000: CMP_TARGET = 4020.73 fate-swr-resample_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20310 -fate-swr-resample_async-s16p-8000-44100: CMP_TARGET = 11185.65 +fate-swr-resample_async-s16p-8000-44100: CMP_TARGET = 11187.01 fate-swr-resample_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20344 $(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,s16p,s16le,s16) |