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
---- ------------ ---------- -----
libsamplerate -DHAVE_LIBSAMPLERATE
-Dresampler=libsamplerate Default when found.
Good choice in most cases.
Built-in -Dfft=builtin -DUSE_BQRESAMPLER
Default when libsamplerate not found.
Default.
Can be distributed with either
the Rubber Band GPL or
commercial licence. Intended to
@@ -430,6 +426,9 @@ Built-in -Dfft=builtin -DUSE_BQRESAMPLER
Newer than, and not as well-tested
as, libsamplerate.
libsamplerate -DHAVE_LIBSAMPLERATE
-Dresampler=libsamplerate Good choice in most cases.
Speex -DUSE_SPEEX
-Dresampler=speex Can be distributed with
either the Rubber Band GPL or

View File

@@ -140,12 +140,8 @@ if fft == 'auto'
endif
if resampler == 'auto'
if samplerate_dep.found()
resampler = 'libsamplerate'
else
resampler = 'builtin'
endif
endif
if fft == 'builtin'
config_summary += { 'FFT': 'Built-in' }
@@ -205,6 +201,9 @@ endif # fft
if resampler == 'builtin'
config_summary += { 'Resampler': 'Built-in' }
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'
feature_defines += ['-DUSE_BQRESAMPLER']

View File

@@ -9,7 +9,7 @@ option('resampler',
type: 'combo',
choices: ['auto', 'builtin', 'libsamplerate', 'speex', 'ipp'],
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',
type: 'string',