oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm/SoxrResampler: use a global soxr_quality_spec_t variable

This commit is contained in:
Max Kellermann 2015-01-21 19:51:59 +01:00
parent 8b366f0795
commit bcbfa560e9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pcm/SoxrResampler.cxx
View File

@ -39,7 +39,7 @@ static constexpr unsigned long SOXR_DEFAULT_RECIPE = SOXR_HQ;
*/ */
static constexpr unsigned long SOXR_INVALID_RECIPE = -1; static constexpr unsigned long SOXR_INVALID_RECIPE = -1;
static unsigned long soxr_quality_recipe; static soxr_quality_spec_t soxr_quality;
static const char * static const char *
soxr_quality_name(unsigned long recipe) soxr_quality_name(unsigned long recipe)
@ -91,16 +91,18 @@ soxr_parse_converter(const char *converter)
bool bool
pcm_resample_soxr_global_init(const char *converter, Error &error) pcm_resample_soxr_global_init(const char *converter, Error &error)
{ {
soxr_quality_recipe = soxr_parse_converter(converter); unsigned long recipe = soxr_parse_converter(converter);
if (soxr_quality_recipe == SOXR_INVALID_RECIPE) { if (recipe == SOXR_INVALID_RECIPE) {
error.Format(soxr_domain, error.Format(soxr_domain,
"unknown samplerate converter '%s'", converter); "unknown samplerate converter '%s'", converter);
return false; return false;
} }
soxr_quality = soxr_quality_spec(recipe, 0);
FormatDebug(soxr_domain, FormatDebug(soxr_domain,
"soxr converter '%s'", "soxr converter '%s'",
soxr_quality_name(soxr_quality_recipe)); soxr_quality_name(recipe));
return true; return true;
} }
@ -113,10 +115,9 @@ SoxrPcmResampler::Open(AudioFormat &af, unsigned new_sample_rate,
assert(audio_valid_sample_rate(new_sample_rate)); assert(audio_valid_sample_rate(new_sample_rate));
soxr_error_t e; soxr_error_t e;
soxr_quality_spec_t quality = soxr_quality_spec(soxr_quality_recipe, 0);
soxr = soxr_create(af.sample_rate, new_sample_rate, soxr = soxr_create(af.sample_rate, new_sample_rate,
af.channels, &e, af.channels, &e,
nullptr, &quality, nullptr); nullptr, &soxr_quality, nullptr);
if (soxr == nullptr) { if (soxr == nullptr) {
error.Format(soxr_domain, error.Format(soxr_domain,
"soxr initialization has failed: %s", e); "soxr initialization has failed: %s", e);