diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-15 06:35:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-15 06:35:35 +0200 |
| commit | 2b58c9c945f7aa2062cbdd204d51949a225b3480 (patch) | |
| tree | 6e42bde317faae93c7abea951f4274977ac93082 | |
| parent | 0bf25c7b08d45e8023e11ebaa61c3abea649bd31 (diff) | |
| download | ffmpeg-2b58c9c945f7aa2062cbdd204d51949a225b3480.tar.gz | |
swresample/resample_template: try to consider src_size more exactly
This should avoid slight differences in the output causes by input
size alignment differences between archs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswresample/resample_template.c | 4 | ||||
| -rw-r--r-- | tests/fate/libswresample.mak | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libswresample/resample_template.c b/libswresample/resample_template.c index a627f1194a..f42846ac5b 100644 --- a/libswresample/resample_template.c +++ b/libswresample/resample_template.c @@ -106,7 +106,9 @@ int RENAME(swri_resample)(ResampleContext *c, DELEM *dst, const DELEM *src, int if(compensation_distance == 0 && c->filter_length == 1 && c->phase_shift==0){ int64_t index2= (1LL<<32)*c->frac/c->src_incr + (1LL<<32)*index; int64_t incr= (1LL<<32) * c->dst_incr / c->src_incr; - dst_size= FFMIN(dst_size, (src_size-1-index) * (int64_t)c->src_incr / c->dst_incr); + int new_size = (src_size * (int64_t)c->src_incr - frac + c->dst_incr - 1) / c->dst_incr; + + dst_size= FFMIN(dst_size, new_size); for(dst_index=0; dst_index < dst_size; dst_index++){ dst[dst_index] = src[index2>>32]; diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak index cc9dd7672f..0f86d4d3f9 100644 --- a/tests/fate/libswresample.mak +++ b/tests/fate/libswresample.mak @@ -326,13 +326,13 @@ fate-swr-resample_nn-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav fate-swr-resample_nn-fltp-44100-8000: CMP_TARGET = 590.98 fate-swr-resample_nn-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20486 -fate-swr-resample_nn-fltp-8000-44100: CMP_TARGET = 3163.03 +fate-swr-resample_nn-fltp-8000-44100: CMP_TARGET = 3163.32 fate-swr-resample_nn-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20480 fate-swr-resample_nn-s16p-44100-8000: CMP_TARGET = 590.97 fate-swr-resample_nn-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20486 -fate-swr-resample_nn-s16p-8000-44100: CMP_TARGET = 3163.10 +fate-swr-resample_nn-s16p-8000-44100: CMP_TARGET = 3163.39 fate-swr-resample_nn-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20480 endef |