mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-12-19 17:47:11 +00:00
b8c6e5a661
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>
95 lines
3.4 KiB
C
95 lines
3.4 KiB
C
/*
|
|
* audio resampling
|
|
* Copyright (c) 2004-2012 Michael Niedermayer <michaelni@gmx.at>
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* audio resampling
|
|
* @author Michael Niedermayer <michaelni@gmx.at>
|
|
*/
|
|
|
|
#include "libavutil/x86/cpu.h"
|
|
#include "libswresample/resample.h"
|
|
|
|
#define RESAMPLE_FUNCS(type, opt) \
|
|
int ff_resample_common_##type##_##opt(ResampleContext *c, void *dst, \
|
|
const void *src, int sz, int upd); \
|
|
int ff_resample_linear_##type##_##opt(ResampleContext *c, void *dst, \
|
|
const void *src, int sz, int upd)
|
|
|
|
RESAMPLE_FUNCS(int16, mmxext);
|
|
RESAMPLE_FUNCS(int16, sse2);
|
|
RESAMPLE_FUNCS(int16, xop);
|
|
RESAMPLE_FUNCS(float, sse);
|
|
RESAMPLE_FUNCS(float, avx);
|
|
RESAMPLE_FUNCS(float, fma3);
|
|
RESAMPLE_FUNCS(float, fma4);
|
|
RESAMPLE_FUNCS(double, sse2);
|
|
|
|
av_cold void swri_resample_dsp_x86_init(ResampleContext *c)
|
|
{
|
|
int av_unused mm_flags = av_get_cpu_flags();
|
|
|
|
/* FIXME use phase_count on asm */
|
|
if (c->phase_count != 1 << c->phase_shift)
|
|
return;
|
|
|
|
switch(c->format){
|
|
case AV_SAMPLE_FMT_S16P:
|
|
if (ARCH_X86_32 && EXTERNAL_MMXEXT(mm_flags)) {
|
|
c->dsp.resample = c->linear ? ff_resample_linear_int16_mmxext
|
|
: ff_resample_common_int16_mmxext;
|
|
}
|
|
if (EXTERNAL_SSE2(mm_flags)) {
|
|
c->dsp.resample = c->linear ? ff_resample_linear_int16_sse2
|
|
: ff_resample_common_int16_sse2;
|
|
}
|
|
if (EXTERNAL_XOP(mm_flags)) {
|
|
c->dsp.resample = c->linear ? ff_resample_linear_int16_xop
|
|
: ff_resample_common_int16_xop;
|
|
}
|
|
break;
|
|
case AV_SAMPLE_FMT_FLTP:
|
|
if (EXTERNAL_SSE(mm_flags)) {
|
|
c->dsp.resample = c->linear ? ff_resample_linear_float_sse
|
|
: ff_resample_common_float_sse;
|
|
}
|
|
if (EXTERNAL_AVX_FAST(mm_flags)) {
|
|
c->dsp.resample = c->linear ? ff_resample_linear_float_avx
|
|
: ff_resample_common_float_avx;
|
|
}
|
|
if (EXTERNAL_FMA3_FAST(mm_flags)) {
|
|
c->dsp.resample = c->linear ? ff_resample_linear_float_fma3
|
|
: ff_resample_common_float_fma3;
|
|
}
|
|
if (EXTERNAL_FMA4(mm_flags)) {
|
|
c->dsp.resample = c->linear ? ff_resample_linear_float_fma4
|
|
: ff_resample_common_float_fma4;
|
|
}
|
|
break;
|
|
case AV_SAMPLE_FMT_DBLP:
|
|
if (EXTERNAL_SSE2(mm_flags)) {
|
|
c->dsp.resample = c->linear ? ff_resample_linear_double_sse2
|
|
: ff_resample_common_double_sse2;
|
|
}
|
|
break;
|
|
}
|
|
}
|