Default to built-in resampler, now it's had a little more testing

This commit is contained in:
Chris Cannam
2022-01-12 10:10:34 +00:00
parent 4bbec50511
commit 8faf25c479
3 changed files with 9 additions and 11 deletions

View File

@@ -416,12 +416,8 @@ Intel IPP -Dfft=ipp -DHAVE_IPP Proprietary, can only be used with
Library Build option CPP define Notes Library Build option CPP define Notes
---- ------------ ---------- ----- ---- ------------ ---------- -----
libsamplerate -DHAVE_LIBSAMPLERATE
-Dresampler=libsamplerate Default when found.
Good choice in most cases.
Built-in -Dfft=builtin -DUSE_BQRESAMPLER Built-in -Dfft=builtin -DUSE_BQRESAMPLER
Default when libsamplerate not found. Default.
Can be distributed with either Can be distributed with either
the Rubber Band GPL or the Rubber Band GPL or
commercial licence. Intended to commercial licence. Intended to
@@ -430,6 +426,9 @@ Built-in -Dfft=builtin -DUSE_BQRESAMPLER
Newer than, and not as well-tested Newer than, and not as well-tested
as, libsamplerate. as, libsamplerate.
libsamplerate -DHAVE_LIBSAMPLERATE
-Dresampler=libsamplerate Good choice in most cases.
Speex -DUSE_SPEEX Speex -DUSE_SPEEX
-Dresampler=speex Can be distributed with -Dresampler=speex Can be distributed with
either the Rubber Band GPL or either the Rubber Band GPL or

View File

@@ -140,11 +140,7 @@ if fft == 'auto'
endif endif
if resampler == 'auto' if resampler == 'auto'
if samplerate_dep.found() resampler = 'builtin'
resampler = 'libsamplerate'
else
resampler = 'builtin'
endif
endif endif
if fft == 'builtin' if fft == 'builtin'
@@ -205,6 +201,9 @@ endif # fft
if resampler == 'builtin' if resampler == 'builtin'
config_summary += { 'Resampler': 'Built-in' } config_summary += { 'Resampler': 'Built-in' }
message('For resampler: using built-in implementation') message('For resampler: using built-in implementation')
if samplerate_dep.found()
message('(to use libsamplerate instead, reconfigure with -Dresampler=libsamplerate)')
endif
library_sources += 'src/dsp/BQResampler.cpp' library_sources += 'src/dsp/BQResampler.cpp'
feature_defines += ['-DUSE_BQRESAMPLER'] feature_defines += ['-DUSE_BQRESAMPLER']

View File

@@ -9,7 +9,7 @@ option('resampler',
type: 'combo', type: 'combo',
choices: ['auto', 'builtin', 'libsamplerate', 'speex', 'ipp'], choices: ['auto', 'builtin', 'libsamplerate', 'speex', 'ipp'],
value: 'auto', value: 'auto',
description: 'Resampler library to use. The default (auto) will use libsamplerate if available, the builtin implementation otherwise.') description: 'Resampler library to use. The default (auto) simply uses the builtin implementation.')
option('ipp_path', option('ipp_path',
type: 'string', type: 'string',