MirrorMirror
/
headphones
mirror of https://github.com/ploopyco/headphones.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove extra loop and process input evently across both cores.

This commit is contained in:
George Norton 2023-08-19 08:22:09 +01:00
parent 5bdae0fc3c
commit 25f3ed25d9
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
firmware/code/run.c
View File

@ -124,27 +124,21 @@ static void __no_inline_not_in_flash_func(_as_audio_packet)(struct usb_endpoint
int32_t *out = (int32_t *) userbuf; int32_t *out = (int32_t *) userbuf;
int samples = usb_buffer->data_len / 2; int samples = usb_buffer->data_len / 2;
// TODO: For some reason if we try to process in from both cores the left and right channels multicore_fifo_push_blocking(samples);
// flip back and forth..
if (preprocessing.reverse_stereo) { if (preprocessing.reverse_stereo) {
for (int i = 0; i < samples; i+=2) { multicore_fifo_push_blocking((uintptr_t) (in - 1));
out[i] = fix16_mul(norm_fix3_28_from_s16sample(in[i+1]), preprocessing.preamp); in ++;
out[i+1] = fix16_mul(norm_fix3_28_from_s16sample(in[i]), preprocessing.preamp);
}
} }
else { else {
for (int i = 0; i < samples; i++) { multicore_fifo_push_blocking((uintptr_t) in);
out[i] = fix16_mul(norm_fix3_28_from_s16sample(in[i]), preprocessing.preamp);
} }
}
multicore_fifo_push_blocking(samples);
for (int i = 0; i < samples; i += 2) { for (int i = 0; i < samples; i += 2) {
fix3_28_t sample = fix16_mul(norm_fix3_28_from_s16sample(in[i]), preprocessing.preamp);
for (int j = 0; j < filter_stages; j++) { for (int j = 0; j < filter_stages; j++) {
out[i] = bqf_transform(out[i], &bqf_filters_left[j], &bqf_filters_mem_left[j]); sample = bqf_transform(sample, &bqf_filters_left[j], &bqf_filters_mem_left[j]);
} }
out[i] = (int32_t) norm_fix3_28_to_s16sample(out[i]); out[i] = (int32_t) norm_fix3_28_to_s16sample(sample);
} }
// Signal to core 1 that we have processed our samples, so it can write to I2S // Signal to core 1 that we have processed our samples, so it can write to I2S
@ -167,12 +161,14 @@ void __no_inline_not_in_flash_func(core1_entry)() {
while (true) { while (true) {
const uint32_t samples = multicore_fifo_pop_blocking(); const uint32_t samples = multicore_fifo_pop_blocking();
int16_t *in = (int16_t *) multicore_fifo_pop_blocking();
for (int i = 1; i < samples; i += 2) { for (int i = 1; i < samples; i += 2) {
fix3_28_t sample = fix16_mul(norm_fix3_28_from_s16sample(in[i]), preprocessing.preamp);
for (int j = 0; j < filter_stages; j++) { for (int j = 0; j < filter_stages; j++) {
out[i] = bqf_transform(out[i], &bqf_filters_right[j], &bqf_filters_mem_right[j]); sample = bqf_transform(sample, &bqf_filters_right[j], &bqf_filters_mem_right[j]);
} }
out[i] = (int32_t) norm_fix3_28_to_s16sample(out[i]); out[i] = (int32_t) norm_fix3_28_to_s16sample(sample);
} }
// Wait for Core 0 to finish running its filtering before we apply config updates // Wait for Core 0 to finish running its filtering before we apply config updates
@ -181,6 +177,8 @@ void __no_inline_not_in_flash_func(core1_entry)() {
} }
} }
static const audio_device_config ad_conf;
void setup() { void setup() {
set_sys_clock_khz(SYSTEM_FREQ / 1000, true); set_sys_clock_khz(SYSTEM_FREQ / 1000, true);
sleep_ms(100); sleep_ms(100);
@ -193,7 +191,7 @@ void setup() {
pico_get_unique_board_id_string(spi_serial_number, 17); pico_get_unique_board_id_string(spi_serial_number, 17);
descriptor_strings[2] = spi_serial_number; descriptor_strings[2] = spi_serial_number;
userbuf = malloc(sizeof(uint8_t) * RINGBUF_LEN_IN_BYTES); userbuf = malloc(2 * ad_conf.ep1.core.wMaxPacketSize);
// Configure DAC PWM // Configure DAC PWM
gpio_set_function(PCM3060_SCKI2_PIN, GPIO_FUNC_PWM); gpio_set_function(PCM3060_SCKI2_PIN, GPIO_FUNC_PWM);