mirror of
https://github.com/mackron/miniaudio.git
synced 2026-04-22 00:06:59 +02:00
Add ma_bpf with support for configuring the number of poles.
This commit is contained in:
David Reid
+205
@@ -1815,6 +1815,31 @@ ma_result ma_bpf2_process_pcm_frames(ma_bpf2* pBPF, void* pFramesOut, const void
|
||||
ma_uint32 ma_bpf2_get_latency(ma_bpf2* pBPF);
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ma_format format;
|
||||
ma_uint32 channels;
|
||||
ma_uint32 sampleRate;
|
||||
double cutoffFrequency;
|
||||
ma_uint32 poles; /* If set to 0, will be treated as a passthrough (no filtering will be applied). */
|
||||
} ma_bpf_config;
|
||||
|
||||
ma_bpf_config ma_bpf_config_init(ma_format format, ma_uint32 channels, ma_uint32 sampleRate, double cutoffFrequency, ma_uint32 poles);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ma_format format;
|
||||
ma_uint32 channels;
|
||||
ma_uint32 bpf2Count;
|
||||
ma_bpf2 bpf2[MA_MAX_FILTER_POLES/2];
|
||||
} ma_bpf;
|
||||
|
||||
ma_result ma_bpf_init(const ma_bpf_config* pConfig, ma_bpf* pBPF);
|
||||
ma_result ma_bpf_reinit(const ma_bpf_config* pConfig, ma_bpf* pBPF);
|
||||
ma_result ma_bpf_process_pcm_frames(ma_bpf* pBPF, void* pFramesOut, const void* pFramesIn, ma_uint64 frameCount);
|
||||
ma_uint32 ma_bpf_get_latency(ma_bpf* pBPF);
|
||||
|
||||
|
||||
/************************************************************************************************************************************************************
|
||||
*************************************************************************************************************************************************************
|
||||
|
||||
@@ -30421,6 +30446,16 @@ ma_result ma_bpf2_reinit(const ma_bpf2_config* pConfig, ma_bpf2* pBPF)
|
||||
return MA_SUCCESS;
|
||||
}
|
||||
|
||||
static MA_INLINE void ma_bpf2_process_pcm_frame_s16(ma_bpf2* pBPF, ma_int16* pFrameOut, const ma_int16* pFrameIn)
|
||||
{
|
||||
ma_biquad_process_pcm_frame_s16(&pBPF->bq, pFrameOut, pFrameIn);
|
||||
}
|
||||
|
||||
static MA_INLINE void ma_bpf2_process_pcm_frame_f32(ma_bpf2* pBPF, float* pFrameOut, const float* pFrameIn)
|
||||
{
|
||||
ma_biquad_process_pcm_frame_f32(&pBPF->bq, pFrameOut, pFrameIn);
|
||||
}
|
||||
|
||||
ma_result ma_bpf2_process_pcm_frames(ma_bpf2* pBPF, void* pFramesOut, const void* pFramesIn, ma_uint64 frameCount)
|
||||
{
|
||||
if (pBPF == NULL) {
|
||||
@@ -30440,6 +30475,176 @@ ma_uint32 ma_bpf2_get_latency(ma_bpf2* pBPF)
|
||||
}
|
||||
|
||||
|
||||
ma_bpf_config ma_bpf_config_init(ma_format format, ma_uint32 channels, ma_uint32 sampleRate, double cutoffFrequency, ma_uint32 poles)
|
||||
{
|
||||
ma_bpf_config config;
|
||||
|
||||
MA_ZERO_OBJECT(&config);
|
||||
config.format = format;
|
||||
config.channels = channels;
|
||||
config.sampleRate = sampleRate;
|
||||
config.cutoffFrequency = cutoffFrequency;
|
||||
config.poles = ma_min(poles, MA_MAX_FILTER_POLES);
|
||||
|
||||
return config;
|
||||
}
|
||||
|
||||
static ma_result ma_bpf_reinit__internal(const ma_bpf_config* pConfig, ma_bpf* pBPF, ma_bool32 isNew)
|
||||
{
|
||||
ma_result result;
|
||||
ma_uint32 bpf2Count;
|
||||
ma_uint32 ibpf2;
|
||||
|
||||
if (pBPF == NULL || pConfig == NULL) {
|
||||
return MA_INVALID_ARGS;
|
||||
}
|
||||
|
||||
/* Only supporting f32 and s16. */
|
||||
if (pConfig->format != ma_format_f32 && pConfig->format != ma_format_s16) {
|
||||
return MA_INVALID_ARGS;
|
||||
}
|
||||
|
||||
/* The format cannot be changed after initialization. */
|
||||
if (pBPF->format != ma_format_unknown && pBPF->format != pConfig->format) {
|
||||
return MA_INVALID_OPERATION;
|
||||
}
|
||||
|
||||
/* The channel count cannot be changed after initialization. */
|
||||
if (pBPF->channels != 0 && pBPF->channels != pConfig->channels) {
|
||||
return MA_INVALID_OPERATION;
|
||||
}
|
||||
|
||||
if (pConfig->poles > MA_MAX_FILTER_POLES) {
|
||||
return MA_INVALID_ARGS;
|
||||
}
|
||||
|
||||
/* We must have an even number of poles. */
|
||||
if ((pConfig->poles & 0x1) != 0) {
|
||||
return MA_INVALID_ARGS;
|
||||
}
|
||||
|
||||
bpf2Count = pConfig->poles / 2;
|
||||
|
||||
MA_ASSERT(bpf2Count <= ma_countof(pBPF->bpf2));
|
||||
|
||||
/* The pole count can't change between reinits. */
|
||||
if (!isNew) {
|
||||
if (pBPF->bpf2Count != bpf2Count) {
|
||||
return MA_INVALID_OPERATION;
|
||||
}
|
||||
}
|
||||
|
||||
for (ibpf2 = 0; ibpf2 < bpf2Count; ibpf2 += 1) {
|
||||
ma_bpf2_config bpf2Config = ma_bpf2_config_init(pConfig->format, pConfig->channels, pConfig->sampleRate, pConfig->cutoffFrequency);
|
||||
|
||||
if (isNew) {
|
||||
result = ma_bpf2_init(&bpf2Config, &pBPF->bpf2[ibpf2]);
|
||||
} else {
|
||||
result = ma_bpf2_reinit(&bpf2Config, &pBPF->bpf2[ibpf2]);
|
||||
}
|
||||
|
||||
if (result != MA_SUCCESS) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
pBPF->bpf2Count = bpf2Count;
|
||||
pBPF->format = pConfig->format;
|
||||
pBPF->channels = pConfig->channels;
|
||||
|
||||
return MA_SUCCESS;
|
||||
}
|
||||
|
||||
ma_result ma_bpf_init(const ma_bpf_config* pConfig, ma_bpf* pBPF)
|
||||
{
|
||||
if (pBPF == NULL) {
|
||||
return MA_INVALID_ARGS;
|
||||
}
|
||||
|
||||
MA_ZERO_OBJECT(pBPF);
|
||||
|
||||
if (pConfig == NULL) {
|
||||
return MA_INVALID_ARGS;
|
||||
}
|
||||
|
||||
return ma_bpf_reinit__internal(pConfig, pBPF, /*isNew*/MA_TRUE);
|
||||
}
|
||||
|
||||
ma_result ma_bpf_reinit(const ma_bpf_config* pConfig, ma_bpf* pBPF)
|
||||
{
|
||||
return ma_bpf_reinit__internal(pConfig, pBPF, /*isNew*/MA_FALSE);
|
||||
}
|
||||
|
||||
ma_result ma_bpf_process_pcm_frames(ma_bpf* pBPF, void* pFramesOut, const void* pFramesIn, ma_uint64 frameCount)
|
||||
{
|
||||
ma_result result;
|
||||
ma_uint32 ibpf2;
|
||||
|
||||
if (pBPF == NULL) {
|
||||
return MA_INVALID_ARGS;
|
||||
}
|
||||
|
||||
/* Faster path for in-place. */
|
||||
if (pFramesOut == pFramesIn) {
|
||||
for (ibpf2 = 0; ibpf2 < pBPF->bpf2Count; ibpf2 += 1) {
|
||||
result = ma_bpf2_process_pcm_frames(&pBPF->bpf2[ibpf2], pFramesOut, pFramesOut, frameCount);
|
||||
if (result != MA_SUCCESS) {
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Slightly slower path for copying. */
|
||||
if (pFramesOut != pFramesIn) {
|
||||
ma_uint32 iFrame;
|
||||
|
||||
/* */ if (pBPF->format == ma_format_f32) {
|
||||
/* */ float* pFramesOutF32 = ( float*)pFramesOut;
|
||||
const float* pFramesInF32 = (const float*)pFramesIn;
|
||||
|
||||
for (iFrame = 0; iFrame < frameCount; iFrame += 1) {
|
||||
MA_COPY_MEMORY(pFramesOutF32, pFramesInF32, ma_get_bytes_per_frame(pBPF->format, pBPF->channels));
|
||||
|
||||
for (ibpf2 = 0; ibpf2 < pBPF->bpf2Count; ibpf2 += 1) {
|
||||
ma_bpf2_process_pcm_frame_f32(&pBPF->bpf2[ibpf2], pFramesOutF32, pFramesOutF32);
|
||||
}
|
||||
|
||||
pFramesOutF32 += pBPF->channels;
|
||||
pFramesInF32 += pBPF->channels;
|
||||
}
|
||||
} else if (pBPF->format == ma_format_s16) {
|
||||
/* */ ma_int16* pFramesOutS16 = ( ma_int16*)pFramesOut;
|
||||
const ma_int16* pFramesInS16 = (const ma_int16*)pFramesIn;
|
||||
|
||||
for (iFrame = 0; iFrame < frameCount; iFrame += 1) {
|
||||
MA_COPY_MEMORY(pFramesOutS16, pFramesInS16, ma_get_bytes_per_frame(pBPF->format, pBPF->channels));
|
||||
|
||||
for (ibpf2 = 0; ibpf2 < pBPF->bpf2Count; ibpf2 += 1) {
|
||||
ma_bpf2_process_pcm_frame_s16(&pBPF->bpf2[ibpf2], pFramesOutS16, pFramesOutS16);
|
||||
}
|
||||
|
||||
pFramesOutS16 += pBPF->channels;
|
||||
pFramesInS16 += pBPF->channels;
|
||||
}
|
||||
} else {
|
||||
MA_ASSERT(MA_FALSE);
|
||||
return MA_INVALID_OPERATION; /* Should never hit this. */
|
||||
}
|
||||
}
|
||||
|
||||
return MA_SUCCESS;
|
||||
}
|
||||
|
||||
ma_uint32 ma_bpf_get_latency(ma_bpf* pBPF)
|
||||
{
|
||||
if (pBPF == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return pBPF->bpf2Count*2;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**************************************************************************************************************************************************************
|
||||
|
||||
|
||||
@@ -1,17 +1,20 @@
|
||||
|
||||
ma_result test_bpf__f32(const char* pInputFilePath)
|
||||
ma_result bpf_init_decoder_and_encoder(const char* pInputFilePath, const char* pOutputFilePath, ma_format format, ma_decoder* pDecoder, drwav* pEncoder)
|
||||
{
|
||||
return filtering_init_decoder_and_encoder(pInputFilePath, pOutputFilePath, format, 0, 0, pDecoder, pEncoder);
|
||||
}
|
||||
|
||||
|
||||
ma_result test_bpf2__by_format(const char* pInputFilePath, const char* pOutputFilePath, ma_format format)
|
||||
{
|
||||
const char* pOutputFilePath = "output/bpf_f32.wav";
|
||||
ma_result result;
|
||||
ma_decoder_config decoderConfig;
|
||||
ma_decoder decoder;
|
||||
drwav_data_format wavFormat;
|
||||
drwav wav;
|
||||
ma_bpf2_config bpfConfig;
|
||||
ma_bpf2 bpf;
|
||||
|
||||
decoderConfig = ma_decoder_config_init(ma_format_f32, 0, 0);
|
||||
result = ma_decoder_init_file(pInputFilePath, &decoderConfig, &decoder);
|
||||
printf(" %s\n", pOutputFilePath);
|
||||
|
||||
result = bpf_init_decoder_and_encoder(pInputFilePath, pOutputFilePath, format, &decoder, &wav);
|
||||
if (result != MA_SUCCESS) {
|
||||
return result;
|
||||
}
|
||||
@@ -20,15 +23,10 @@ ma_result test_bpf__f32(const char* pInputFilePath)
|
||||
result = ma_bpf2_init(&bpfConfig, &bpf);
|
||||
if (result != MA_SUCCESS) {
|
||||
ma_decoder_uninit(&decoder);
|
||||
drwav_uninit(&wav);
|
||||
return result;
|
||||
}
|
||||
|
||||
wavFormat = drwav_data_format_from_minaudio_format(decoder.outputFormat, decoder.outputChannels, decoder.outputSampleRate);
|
||||
if (!drwav_init_file_write(&wav, pOutputFilePath, &wavFormat, NULL)) {
|
||||
ma_decoder_uninit(&decoder);
|
||||
return MA_ERROR;
|
||||
}
|
||||
|
||||
for (;;) {
|
||||
ma_uint8 tempIn[4096];
|
||||
ma_uint8 tempOut[4096];
|
||||
@@ -55,6 +53,77 @@ ma_result test_bpf__f32(const char* pInputFilePath)
|
||||
return MA_SUCCESS;
|
||||
}
|
||||
|
||||
ma_result test_bpf2__f32(const char* pInputFilePath)
|
||||
{
|
||||
return test_bpf2__by_format(pInputFilePath, "output/bpf2_f32.wav", ma_format_f32);
|
||||
}
|
||||
|
||||
ma_result test_bpf2__s16(const char* pInputFilePath)
|
||||
{
|
||||
return test_bpf2__by_format(pInputFilePath, "output/bpf2_s16.wav", ma_format_s16);
|
||||
}
|
||||
|
||||
|
||||
ma_result test_bpf4__by_format(const char* pInputFilePath, const char* pOutputFilePath, ma_format format)
|
||||
{
|
||||
ma_result result;
|
||||
ma_decoder decoder;
|
||||
drwav wav;
|
||||
ma_bpf_config bpfConfig;
|
||||
ma_bpf bpf;
|
||||
|
||||
printf(" %s\n", pOutputFilePath);
|
||||
|
||||
result = bpf_init_decoder_and_encoder(pInputFilePath, pOutputFilePath, format, &decoder, &wav);
|
||||
if (result != MA_SUCCESS) {
|
||||
return result;
|
||||
}
|
||||
|
||||
bpfConfig = ma_bpf_config_init(decoder.outputFormat, decoder.outputChannels, decoder.outputSampleRate, 2000, 4);
|
||||
result = ma_bpf_init(&bpfConfig, &bpf);
|
||||
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_bpf_process_pcm_frames(&bpf, 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_bpf4__f32(const char* pInputFilePath)
|
||||
{
|
||||
return test_bpf4__by_format(pInputFilePath, "output/bpf4_f32.wav", ma_format_f32);
|
||||
}
|
||||
|
||||
ma_result test_bpf4__s16(const char* pInputFilePath)
|
||||
{
|
||||
return test_bpf4__by_format(pInputFilePath, "output/bpf4_s16.wav", ma_format_s16);
|
||||
}
|
||||
|
||||
|
||||
int test_entry__bpf(int argc, char** argv)
|
||||
{
|
||||
ma_result result;
|
||||
@@ -68,11 +137,29 @@ int test_entry__bpf(int argc, char** argv)
|
||||
|
||||
pInputFilePath = argv[1];
|
||||
|
||||
result = test_bpf__f32(pInputFilePath);
|
||||
|
||||
result = test_bpf2__f32(pInputFilePath);
|
||||
if (result != MA_SUCCESS) {
|
||||
hasError = MA_TRUE;
|
||||
}
|
||||
|
||||
result = test_bpf2__s16(pInputFilePath);
|
||||
if (result != MA_SUCCESS) {
|
||||
hasError = MA_TRUE;
|
||||
}
|
||||
|
||||
|
||||
result = test_bpf4__f32(pInputFilePath);
|
||||
if (result != MA_SUCCESS) {
|
||||
hasError = MA_TRUE;
|
||||
}
|
||||
|
||||
result = test_bpf4__s16(pInputFilePath);
|
||||
if (result != MA_SUCCESS) {
|
||||
hasError = MA_TRUE;
|
||||
}
|
||||
|
||||
|
||||
if (hasError) {
|
||||
return -1;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user