poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Optimize the additive DAC code, fixing performance-related hangs (#21662)

Browse source
This commit is contained in:
Nebuleon 2023-09-24 22:26:02 -04:00 committed by GitHub
parent 7850f0d8c6
commit 1d94de5358
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
platforms/chibios/drivers/audio_dac_additive.c
View file

@ -121,24 +121,27 @@ __attribute__((weak)) uint16_t dac_value_generate(void) {
/* doing additive wave synthesis over all currently playing tones = adding up /* doing additive wave synthesis over all currently playing tones = adding up
* sine-wave-samples for each frequency, scaled by the number of active tones * sine-wave-samples for each frequency, scaled by the number of active tones
*/ */
uint16_t value = 0; uint_fast16_t value = 0;
float frequency = 0.0f; float frequency = 0.0f;
for (uint8_t i = 0; i < active_tones_snapshot_length; i++) { for (size_t i = 0; i < active_tones_snapshot_length; i++) {
/* Note: a user implementation does not have to rely on the active_tones_snapshot, but /* Note: a user implementation does not have to rely on the active_tones_snapshot, but
* could directly query the active frequencies through audio_get_processed_frequency */ * could directly query the active frequencies through audio_get_processed_frequency */
frequency = active_tones_snapshot[i]; frequency = active_tones_snapshot[i];
dac_if[i] = dac_if[i] + ((frequency * AUDIO_DAC_BUFFER_SIZE) / AUDIO_DAC_SAMPLE_RATE) * 2 / 3; float new_dac_if = dac_if[i];
new_dac_if += frequency * ((float)AUDIO_DAC_BUFFER_SIZE / AUDIO_DAC_SAMPLE_RATE * 2.0f / 3.0f);
/*Note: the 2/3 are necessary to get the correct frequencies on the /*Note: the 2/3 are necessary to get the correct frequencies on the
* DAC output (as measured with an oscilloscope), since the gpt * DAC output (as measured with an oscilloscope), since the gpt
* timer runs with 3*AUDIO_DAC_SAMPLE_RATE; and the DAC callback * timer runs with 3*AUDIO_DAC_SAMPLE_RATE; and the DAC callback
* is called twice per conversion.*/ * is called twice per conversion.*/
dac_if[i] = fmodf(dac_if[i], AUDIO_DAC_BUFFER_SIZE); while (new_dac_if >= AUDIO_DAC_BUFFER_SIZE)
new_dac_if -= AUDIO_DAC_BUFFER_SIZE;
dac_if[i] = new_dac_if;
// Wavetable generation/lookup // Wavetable generation/lookup
uint16_t dac_i = (uint16_t)dac_if[i]; size_t dac_i = (size_t)new_dac_if;
#if defined(AUDIO_DAC_SAMPLE_WAVEFORM_SINE) #if defined(AUDIO_DAC_SAMPLE_WAVEFORM_SINE)
value += dac_buffer_sine[dac_i] / active_tones_snapshot_length; value += dac_buffer_sine[dac_i] / active_tones_snapshot_length;