Update reverb and vocoder examples.

This commit is contained in:
David Reid
2026-04-29 13:08:50 +10:00
parent ab15b24065
commit 1129061e19
2 changed files with 32 additions and 23 deletions
@@ -7,10 +7,10 @@
#define DEVICE_CHANNELS 1 /* For this example, always set to 1. */ #define DEVICE_CHANNELS 1 /* For this example, always set to 1. */
#define DEVICE_SAMPLE_RATE 48000 /* Cannot be less than 22050 for this example. */ #define DEVICE_SAMPLE_RATE 48000 /* Cannot be less than 22050 for this example. */
static ma_audio_buffer_ref g_dataSupply; /* The underlying data source of the source node. */ static ma_audio_ring_buffer g_dataSupply; /* The underlying data source of the source node. */
static ma_data_source_node g_dataSupplyNode; /* The node that will sit at the root level. Will be reading data from g_dataSupply. */ static ma_data_source_node g_dataSupplyNode; /* The node that will sit at the root level. Will be reading data from g_dataSupply. */
static ma_reverb_node g_reverbNode; /* The reverb node. */ static ma_reverb_node g_reverbNode; /* The reverb node. */
static ma_node_graph g_nodeGraph; /* The main node graph that we'll be feeding data through. */ static ma_node_graph g_nodeGraph; /* The main node graph that we'll be feeding data through. */
void data_callback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uint32 frameCount) void data_callback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uint32 frameCount)
{ {
@@ -28,7 +28,7 @@ void data_callback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uin
the data source is our `pInput` buffer. We need to update the underlying data source so that it the data source is our `pInput` buffer. We need to update the underlying data source so that it
read data from `pInput`. read data from `pInput`.
*/ */
ma_audio_buffer_ref_set_data(&g_dataSupply, pInput, frameCount); ma_audio_ring_buffer_write_pcm_frames(&g_dataSupply, pInput, frameCount, NULL);
/* With the source buffer configured we can now read directly from the node graph. */ /* With the source buffer configured we can now read directly from the node graph. */
ma_node_graph_read_pcm_frames(&g_nodeGraph, pOutput, frameCount, NULL); ma_node_graph_read_pcm_frames(&g_nodeGraph, pOutput, frameCount, NULL);
@@ -42,6 +42,7 @@ int main(int argc, char** argv)
ma_node_graph_config nodeGraphConfig; ma_node_graph_config nodeGraphConfig;
ma_reverb_node_config reverbNodeConfig; ma_reverb_node_config reverbNodeConfig;
ma_data_source_node_config dataSupplyNodeConfig; ma_data_source_node_config dataSupplyNodeConfig;
ma_audio_ring_buffer_config ringBufferConfig;
deviceConfig = ma_device_config_init(ma_device_type_duplex); deviceConfig = ma_device_config_init(ma_device_type_duplex);
deviceConfig.capture.pDeviceID = NULL; deviceConfig.capture.pDeviceID = NULL;
@@ -82,7 +83,9 @@ int main(int argc, char** argv)
/* Data supply. Attached to input bus 0 of the reverb node. */ /* Data supply. Attached to input bus 0 of the reverb node. */
result = ma_audio_buffer_ref_init(device.capture.format, device.capture.channels, device.sampleRate, NULL, 0, &g_dataSupply); ringBufferConfig = ma_audio_ring_buffer_config_init(device.capture.format, device.capture.channels, device.sampleRate, device.capture.internalPeriodSizeInFrames * 3);
result = ma_audio_ring_buffer_init(&ringBufferConfig, &g_dataSupply);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
printf("Failed to initialize audio buffer for source."); printf("Failed to initialize audio buffer for source.");
goto done2; goto done2;
@@ -93,7 +96,7 @@ int main(int argc, char** argv)
result = ma_data_source_node_init(&g_nodeGraph, &dataSupplyNodeConfig, NULL, &g_dataSupplyNode); result = ma_data_source_node_init(&g_nodeGraph, &dataSupplyNodeConfig, NULL, &g_dataSupplyNode);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
printf("Failed to initialize source node."); printf("Failed to initialize source node.");
goto done2; goto done3;
} }
ma_node_attach_output_bus(&g_dataSupplyNode, 0, &g_reverbNode, 0); ma_node_attach_output_bus(&g_dataSupplyNode, 0, &g_reverbNode, 0);
@@ -110,7 +113,8 @@ int main(int argc, char** argv)
ma_device_stop(&device); ma_device_stop(&device);
/*done3:*/ ma_data_source_node_uninit(&g_dataSupplyNode, NULL); /*done4:*/ ma_data_source_node_uninit(&g_dataSupplyNode, NULL);
done3: ma_audio_ring_buffer_uninit(&g_dataSupply);
done2: ma_reverb_node_uninit(&g_reverbNode, NULL); done2: ma_reverb_node_uninit(&g_reverbNode, NULL);
done1: ma_node_graph_uninit(&g_nodeGraph); done1: ma_node_graph_uninit(&g_nodeGraph);
done0: ma_device_uninit(&device); done0: ma_device_uninit(&device);
@@ -11,15 +11,15 @@ effect.
#include <stdio.h> #include <stdio.h>
#define DEVICE_FORMAT ma_format_f32 /* Must always be f32 for this example because the node graph system only works with this. */ #define DEVICE_FORMAT ma_format_f32 /* Must always be f32 for this example because the node graph system only works with this. */
#define DEVICE_CHANNELS 1 /* For this example, always set to 1. */ #define DEVICE_CHANNELS 1 /* For this example, always set to 1. */
static ma_waveform g_sourceData; /* The underlying data source of the excite node. */ static ma_waveform g_sourceData; /* The underlying data source of the excite node. */
static ma_audio_buffer_ref g_exciteData; /* The underlying data source of the source node. */ static ma_audio_ring_buffer g_exciteData; /* The underlying data source of the source node. */
static ma_data_source_node g_sourceNode; /* A data source node containing the source data we'll be sending through to the vocoder. This will be routed into the first bus of the vocoder node. */ static ma_data_source_node g_sourceNode; /* A data source node containing the source data we'll be sending through to the vocoder. This will be routed into the first bus of the vocoder node. */
static ma_data_source_node g_exciteNode; /* A data source node containing the excite data we'll be sending through to the vocoder. This will be routed into the second bus of the vocoder node. */ static ma_data_source_node g_exciteNode; /* A data source node containing the excite data we'll be sending through to the vocoder. This will be routed into the second bus of the vocoder node. */
static ma_vocoder_node g_vocoderNode; /* The vocoder node. */ static ma_vocoder_node g_vocoderNode; /* The vocoder node. */
static ma_node_graph g_nodeGraph; static ma_node_graph g_nodeGraph;
void data_callback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uint32 frameCount) void data_callback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uint32 frameCount)
{ {
@@ -37,7 +37,7 @@ void data_callback(ma_device* pDevice, void* pOutput, const void* pInput, ma_uin
the data source is our `pInput` buffer. We need to update the underlying data source so that it the data source is our `pInput` buffer. We need to update the underlying data source so that it
read data from `pInput`. read data from `pInput`.
*/ */
ma_audio_buffer_ref_set_data(&g_exciteData, pInput, frameCount); ma_audio_ring_buffer_write_pcm_frames(&g_exciteData, pInput, frameCount, NULL);
/* With the source buffer configured we can now read directly from the node graph. */ /* With the source buffer configured we can now read directly from the node graph. */
ma_node_graph_read_pcm_frames(&g_nodeGraph, pOutput, frameCount, NULL); ma_node_graph_read_pcm_frames(&g_nodeGraph, pOutput, frameCount, NULL);
@@ -53,6 +53,7 @@ int main(int argc, char** argv)
ma_data_source_node_config sourceNodeConfig; ma_data_source_node_config sourceNodeConfig;
ma_data_source_node_config exciteNodeConfig; ma_data_source_node_config exciteNodeConfig;
ma_waveform_config waveformConfig; ma_waveform_config waveformConfig;
ma_audio_ring_buffer_config ringBufferConfig;
deviceConfig = ma_device_config_init(ma_device_type_duplex); deviceConfig = ma_device_config_init(ma_device_type_duplex);
deviceConfig.capture.pDeviceID = NULL; deviceConfig.capture.pDeviceID = NULL;
@@ -100,7 +101,7 @@ int main(int argc, char** argv)
result = ma_waveform_init(&waveformConfig, &g_sourceData); result = ma_waveform_init(&waveformConfig, &g_sourceData);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
printf("Failed to initialize waveform for excite node."); printf("Failed to initialize waveform for excite node.");
goto done3; goto done2;
} }
sourceNodeConfig = ma_data_source_node_config_init(&g_sourceData); sourceNodeConfig = ma_data_source_node_config_init(&g_sourceData);
@@ -115,10 +116,12 @@ int main(int argc, char** argv)
/* Excite/modulator. Attached to input bus 1 of the vocoder node. */ /* Excite/modulator. Attached to input bus 1 of the vocoder node. */
result = ma_audio_buffer_ref_init(device.capture.format, device.capture.channels, device.sampleRate, NULL, 0, &g_exciteData); ringBufferConfig = ma_audio_ring_buffer_config_init(device.capture.format, device.capture.channels, device.sampleRate, device.capture.internalPeriodSizeInFrames * 3);
result = ma_audio_ring_buffer_init(&ringBufferConfig, &g_exciteData);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
printf("Failed to initialize audio buffer for source."); printf("Failed to initialize audio buffer for source.");
goto done2; goto done4;
} }
exciteNodeConfig = ma_data_source_node_config_init(&g_exciteData); exciteNodeConfig = ma_data_source_node_config_init(&g_exciteData);
@@ -126,7 +129,7 @@ int main(int argc, char** argv)
result = ma_data_source_node_init(&g_nodeGraph, &exciteNodeConfig, NULL, &g_exciteNode); result = ma_data_source_node_init(&g_nodeGraph, &exciteNodeConfig, NULL, &g_exciteNode);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
printf("Failed to initialize source node."); printf("Failed to initialize source node.");
goto done2; goto done5;
} }
ma_node_attach_output_bus(&g_exciteNode, 0, &g_vocoderNode, 1); ma_node_attach_output_bus(&g_exciteNode, 0, &g_vocoderNode, 1);
@@ -140,8 +143,10 @@ int main(int argc, char** argv)
/* It's important that we stop the device first or else we'll uninitialize the graph from under the device. */ /* It's important that we stop the device first or else we'll uninitialize the graph from under the device. */
ma_device_stop(&device); ma_device_stop(&device);
/*done4:*/ ma_data_source_node_uninit(&g_exciteNode, NULL); /*done6:*/ ma_data_source_node_uninit(&g_exciteNode, NULL);
done3: ma_data_source_node_uninit(&g_sourceNode, NULL); done5: ma_audio_ring_buffer_uninit(&g_exciteData);
done4: ma_data_source_node_uninit(&g_sourceNode, NULL);
done3: ma_waveform_uninit(&g_sourceData);
done2: ma_vocoder_node_uninit(&g_vocoderNode, NULL); done2: ma_vocoder_node_uninit(&g_vocoderNode, NULL);
done1: ma_node_graph_uninit(&g_nodeGraph); done1: ma_node_graph_uninit(&g_nodeGraph);
done0: ma_device_uninit(&device); done0: ma_device_uninit(&device);