Add ma_hpf with support for configuring the number of poles.

This commit is contained in:
David Reid
2020-02-23 14:07:48 +10:00
parent 2e1869ab1b
commit cda27514f0
2 changed files with 312 additions and 2 deletions
+75 -2
View File
@@ -60,7 +60,7 @@ ma_result test_hpf1__f32(const char* pInputFilePath)
ma_result test_hpf1__s16(const char* pInputFilePath)
{
return test_hpf1__by_format(pInputFilePath, "output/hpf1_s16.wav", ma_format_f32);
return test_hpf1__by_format(pInputFilePath, "output/hpf1_s16.wav", ma_format_s16);
}
@@ -120,9 +120,70 @@ ma_result test_hpf2__f32(const char* pInputFilePath)
ma_result test_hpf2__s16(const char* pInputFilePath)
{
return test_hpf2__by_format(pInputFilePath, "output/hpf2_s16.wav", ma_format_f32);
return test_hpf2__by_format(pInputFilePath, "output/hpf2_s16.wav", ma_format_s16);
}
ma_result test_hpf3__by_format(const char* pInputFilePath, const char* pOutputFilePath, ma_format format)
{
ma_result result;
ma_decoder decoder;
drwav wav;
ma_hpf_config hpfConfig;
ma_hpf hpf;
printf(" %s\n", pOutputFilePath);
result = hpf_init_decoder_and_encoder(pInputFilePath, pOutputFilePath, format, &decoder, &wav);
if (result != MA_SUCCESS) {
return result;
}
hpfConfig = ma_hpf_config_init(decoder.outputFormat, decoder.outputChannels, decoder.outputSampleRate, 2000, 3);
result = ma_hpf_init(&hpfConfig, &hpf);
if (result != MA_SUCCESS) {
ma_decoder_uninit(&decoder);
drwav_uninit(&wav);
return result;
}
for (;;) {
ma_uint8 tempIn[4096];
ma_uint8 tempOut[4096];
ma_uint64 tempCapIn = sizeof(tempIn) / ma_get_bytes_per_frame(decoder.outputFormat, decoder.outputChannels);
ma_uint64 tempCapOut = sizeof(tempOut) / ma_get_bytes_per_frame(decoder.outputFormat, decoder.outputChannels);
ma_uint64 framesToRead;
ma_uint64 framesJustRead;
framesToRead = ma_min(tempCapIn, tempCapOut);
framesJustRead = ma_decoder_read_pcm_frames(&decoder, tempIn, framesToRead);
/* Filter */
ma_hpf_process_pcm_frames(&hpf, tempOut, tempIn, framesJustRead);
/* Write to the WAV file. */
drwav_write_pcm_frames(&wav, framesJustRead, tempOut);
if (framesJustRead < framesToRead) {
break;
}
}
drwav_uninit(&wav);
return MA_SUCCESS;
}
ma_result test_hpf3__f32(const char* pInputFilePath)
{
return test_hpf3__by_format(pInputFilePath, "output/hpf3_f32.wav", ma_format_f32);
}
ma_result test_hpf3__s16(const char* pInputFilePath)
{
return test_hpf3__by_format(pInputFilePath, "output/hpf3_s16.wav", ma_format_s16);
}
int test_entry__hpf(int argc, char** argv)
{
ma_result result;
@@ -158,6 +219,18 @@ int test_entry__hpf(int argc, char** argv)
hasError = MA_TRUE;
}
result = test_hpf3__f32(pInputFilePath);
if (result != MA_SUCCESS) {
hasError = MA_TRUE;
}
result = test_hpf3__s16(pInputFilePath);
if (result != MA_SUCCESS) {
hasError = MA_TRUE;
}
if (hasError) {
return -1;
} else {