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

Add resampling mode setting to modplug decoder

Browse Source
This commit is contained in:
GrimReaperFloof 2021-05-07 18:48:55 +02:00
parent 423f2df5e0
commit a0334d1d94
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/plugins.rst
View File

@ -484,6 +484,8 @@ Module player based on MODPlug.
* - Setting * - Setting
- Description - Description
* - **resampling_mode nearest|linear|spline|fir**
- Sets the resampling mode. "nearest" disables interpolation (good for chiptunes). "linear" makes modplug use linear interpolation (fast, good quality). "spline" makes modplug use cubic spline interpolation (high quality). "fir" makes modplug use 8-tap fir filter (extremely high quality). Defaults to "fir".
* - **loop_count** * - **loop_count**
- Number of times to loop the module if it uses backward loops. Default is 0 which prevents looping. -1 loops forever. - Number of times to loop the module if it uses backward loops. Default is 0 which prevents looping. -1 loops forever.

17
src/decoder/plugins/ModplugDecoderPlugin.cxx
View File

@ -44,10 +44,25 @@ static constexpr size_t MODPLUG_PREALLOC_BLOCK = 256 * 1024;
static constexpr offset_type MODPLUG_FILE_LIMIT = 100 * 1024 * 1024; static constexpr offset_type MODPLUG_FILE_LIMIT = 100 * 1024 * 1024;
static int modplug_loop_count; static int modplug_loop_count;
static unsigned char modplug_resampling_mode;
static bool static bool
modplug_decoder_init(const ConfigBlock &block) modplug_decoder_init(const ConfigBlock &block)
{ {
const char* modplug_resampling_mode_value = block.GetBlockValue("resampling_mode", "fir");
if (strcmp(modplug_resampling_mode_value, "nearest") == 0) {
modplug_resampling_mode = MODPLUG_RESAMPLE_NEAREST;
} else if (strcmp(modplug_resampling_mode_value, "linear") == 0) {
modplug_resampling_mode = MODPLUG_RESAMPLE_LINEAR;
} else if (strcmp(modplug_resampling_mode_value, "spline") == 0) {
modplug_resampling_mode = MODPLUG_RESAMPLE_SPLINE;
} else if (strcmp(modplug_resampling_mode_value, "fir") == 0) {
modplug_resampling_mode = MODPLUG_RESAMPLE_FIR;
} else {
throw FormatRuntimeError("Invalid resampling mode in line %d: %s",
block.line, modplug_resampling_mode_value);
}
modplug_loop_count = block.GetBlockValue("loop_count", 0); modplug_loop_count = block.GetBlockValue("loop_count", 0);
if (modplug_loop_count < -1) if (modplug_loop_count < -1)
throw FormatRuntimeError("Invalid loop count in line %d: %i", throw FormatRuntimeError("Invalid loop count in line %d: %i",
@ -139,7 +154,7 @@ mod_decode(DecoderClient &client, InputStream &is)
ModPlug_GetSettings(&settings); ModPlug_GetSettings(&settings);
/* alter setting */ /* alter setting */
settings.mResamplingMode = MODPLUG_RESAMPLE_FIR; /* RESAMP */ settings.mResamplingMode = modplug_resampling_mode;
settings.mChannels = 2; settings.mChannels = 2;
settings.mBits = 16; settings.mBits = 16;
settings.mFrequency = 44100; settings.mFrequency = 44100;