summaryrefslogtreecommitdiff
path: root/libswresample/arm
diff options
context:
space:
mode:
authorMuhammad Faiz <mfcc64@gmail.com>2016-06-12 05:19:20 +0700
committerMuhammad Faiz <mfcc64@gmail.com>2016-06-13 12:36:01 +0700
commitb8c6e5a6618337a82ea9d0bafb471eeecc51b919 (patch)
tree2e3f169f004747e59cde3043312446deec719711 /libswresample/arm
parent5ca44ebd99937b0038c25784570fa80d158b21fb (diff)
swresample: add exact_rational option
give high quality resampling as good as with linear_interp=on as fast as without linear_interp=on tested visually with ffplay ffplay -f lavfi "aevalsrc='sin(10000*t*t)', aresample=osr=48000, showcqt=gamma=5" ffplay -f lavfi "aevalsrc='sin(10000*t*t)', aresample=osr=48000:linear_interp=on, showcqt=gamma=5" ffplay -f lavfi "aevalsrc='sin(10000*t*t)', aresample=osr=48000:exact_rational=on, showcqt=gamma=5" slightly speed improvement for fair comparison with -cpuflags 0 audio.wav is ~ 1 hour 44100 stereo 16bit wav file ffmpeg -i audio.wav -af aresample=osr=48000 -f null - old new real 13.498s 13.121s user 13.364s 12.987s sys 0.131s 0.129s linear_interp=on old new real 23.035s 23.050s user 22.907s 22.917s sys 0.119s 0.125s exact_rational=on real 12.418s user 12.298s sys 0.114s possibility to decrease memory usage if soft compensation is ignored Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Diffstat (limited to 'libswresample/arm')
-rw-r--r--libswresample/arm/resample_init.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/libswresample/arm/resample_init.c b/libswresample/arm/resample_init.c
index 797c53094a..003fafd29b 100644
--- a/libswresample/arm/resample_init.c
+++ b/libswresample/arm/resample_init.c
@@ -44,11 +44,15 @@ static int ff_resample_common_##TYPE##_neon(ResampleContext *c, void *dest, cons
int dst_index; \
int index= c->index; \
int frac= c->frac; \
- int sample_index = index >> c->phase_shift; \
+ int sample_index = 0; \
int x4_aligned_filter_length = c->filter_length & ~3; \
int x8_aligned_filter_length = c->filter_length & ~7; \
\
- index &= c->phase_mask; \
+ while (index >= c->phase_count) { \
+ sample_index++; \
+ index -= c->phase_count; \
+ } \
+ \
for (dst_index = 0; dst_index < n; dst_index++) { \
FELEM *filter = ((FELEM *) c->filter_bank) + c->filter_alloc * index; \
\
@@ -75,8 +79,11 @@ static int ff_resample_common_##TYPE##_neon(ResampleContext *c, void *dest, cons
frac -= c->src_incr; \
index++; \
} \
- sample_index += index >> c->phase_shift; \
- index &= c->phase_mask; \
+ \
+ while (index >= c->phase_count) { \
+ sample_index++; \
+ index -= c->phase_count; \
+ } \
} \
\
if(update_ctx){ \