Skip to content

Commit aabb56c

Browse files
committed
nrf: i2sout: Only update hold_value when appropriate
If we put no samples into the buffer, then there is no last sample to fill out hold_value with. (and, in fact, the expression such as *(uint32_t*)(buffer-4) is outside an allocated region) Detect this condition, and leave the prior value in place. This improves clicks heard when pausing and resuming a waveform.
1 parent c000567 commit aabb56c

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

ports/nrf/common-hal/audiobusio/I2SOut.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ void choose_i2s_clocking(audiobusio_i2sout_obj_t *self, uint32_t sample_rate) {
108108

109109
static void i2s_buffer_fill(audiobusio_i2sout_obj_t* self) {
110110
void *buffer = self->buffers[self->next_buffer];
111+
void *buffer_start = buffer;
111112
NRF_I2S->TXD.PTR = (uintptr_t)buffer;
112113
self->next_buffer = !self->next_buffer;
113114
size_t bytesleft = self->buffer_length;
@@ -157,15 +158,17 @@ static void i2s_buffer_fill(audiobusio_i2sout_obj_t* self) {
157158

158159
// Find the last frame of real audio data and replicate its samples until
159160
// you have 32 bits worth, which is the fundamental unit of nRF I2S DMA
160-
if (self->bytes_per_sample == 1 && self->channel_count == 1) {
161-
// For 8-bit mono, 4 copies of the final sample are required
162-
self->hold_value = 0x01010101 * *(uint8_t*)(buffer-1);
163-
} else if (self->bytes_per_sample == 2 && self->channel_count == 2) {
164-
// For 16-bit stereo, 1 copy of the final sample is required
165-
self->hold_value = *(uint32_t*)(buffer-4);
166-
} else {
167-
// For 8-bit stereo and 16-bit mono, 2 copies of the final sample are required
168-
self->hold_value = 0x00010001 * *(uint16_t*)(buffer-2);
161+
if(buffer != buffer_start) {
162+
if (self->bytes_per_sample == 1 && self->channel_count == 1) {
163+
// For 8-bit mono, 4 copies of the final sample are required
164+
self->hold_value = 0x01010101 * *(uint8_t*)(buffer-1);
165+
} else if (self->bytes_per_sample == 2 && self->channel_count == 2) {
166+
// For 16-bit stereo, 1 copy of the final sample is required
167+
self->hold_value = *(uint32_t*)(buffer-4);
168+
} else {
169+
// For 8-bit stereo and 16-bit mono, 2 copies of the final sample are required
170+
self->hold_value = 0x00010001 * *(uint16_t*)(buffer-2);
171+
}
169172
}
170173

171174
// Emulate pausing and stopping by filling the DMA buffer with copies of

0 commit comments

Comments
 (0)