djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp2s2: enlarge stack-buffer, use it instead of i2s_zero_dma_buffer

Browse Source 
.. it's not clear that there was a problem with i2s_zero_dma_buffer, but
just in case.
This commit is contained in:
Jeff Epler 2021-01-07 16:29:52 -06:00
parent d3afda61d8
commit cfd8288dfa
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ports/esp32s2/i2s_common.c
View File

@ -24,6 +24,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <string.h>
#include "py/runtime.h" #include "py/runtime.h"
#include "i2s_common.h" #include "i2s_common.h"
@ -69,8 +71,17 @@ static void i2s_fill_buffer(i2s_t *self) {
if (self->instance < 0 || self->instance >= I2S_NUM_MAX) { if (self->instance < 0 || self->instance >= I2S_NUM_MAX) {
return; return;
} }
if (self->paused || !self->sample) { #define STACK_BUFFER_SIZE (512)
i2s_zero_dma_buffer(self->instance); int16_t signed_samples[STACK_BUFFER_SIZE / sizeof(int16_t)];
mp_printf(&mp_plat_print, "playing=%d paused=%d stopping=%d sample@%p sample_data=%p..%p\n", self->playing, self->paused, self->stopping, self->sample, self->sample_data, self->sample_end);
if (!self->playing || self->paused || !self->sample) {
memset(signed_samples, 0, sizeof(signed_samples));
size_t bytes_written = 0;
do {
ESP_CALL_RAISE(i2s_write(self->instance, signed_samples, sizeof(signed_samples), &bytes_written, 0));
} while (bytes_written != 0);
return; return;
} }
while (!self->stopping) { while (!self->stopping) {
@ -102,7 +113,6 @@ static void i2s_fill_buffer(i2s_t *self) {
ESP_CALL_RAISE(i2s_write_expand(self->instance, self->sample_data, bytecount, 8, 16, &bytes_written, 0)); ESP_CALL_RAISE(i2s_write_expand(self->instance, self->sample_data, bytecount, 8, 16, &bytes_written, 0));
} }
} else { } else {
#define STACK_BUFFER_SIZE (64)
const size_t bytes_per_output_frame = 4; const size_t bytes_per_output_frame = 4;
size_t bytes_per_input_frame = self->channel_count * self->bytes_per_sample; size_t bytes_per_input_frame = self->channel_count * self->bytes_per_sample;
size_t framecount = MIN(STACK_BUFFER_SIZE / bytes_per_output_frame, bytecount / bytes_per_input_frame); size_t framecount = MIN(STACK_BUFFER_SIZE / bytes_per_output_frame, bytecount / bytes_per_input_frame);