Merge pull request #5079 from dhalbert/debug-audio

Fix various RP2040 and SAMD audio issues

Author: tannewt

locale/circuitpython.pot

@@ -493,6 +493,10 @@ msgstr ""
 msgid "Attempted heap allocation when VM not running."
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Audio conversion not implemented"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
 msgstr ""
@@ -1217,6 +1221,10 @@ msgstr ""
 msgid "Insufficient encryption"
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Internal audio buffer too small"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
 msgstr ""

ports/atmel-samd/audio_dma.c

@@ -157,7 +157,13 @@ void audio_dma_load_next_block(audio_dma_t *dma) {
         if (dma->loop) {
             audiosample_reset_buffer(dma->sample, dma->single_channel_output, dma->audio_channel);
         } else {
-            descriptor->DESCADDR.reg = 0;
+            if ((output_buffer_length == 0) && dma_transfer_status(SHARED_RX_CHANNEL) & 0x3) {
+                // Nothing further to read and previous buffer is finished.
+                audio_dma_stop(dma);
+            } else {
+                // Break descriptor chain.
+                descriptor->DESCADDR.reg = 0;
+            }
         }
     }
     descriptor->BTCTRL.bit.VALID = true;
@@ -214,21 +220,23 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t *dma,
     if (output_signed != samples_signed) {
         output_spacing = 1;
         max_buffer_length /= dma->spacing;
-        dma->first_buffer = (uint8_t *)m_realloc(dma->first_buffer, max_buffer_length);
-        if (dma->first_buffer == NULL) {
+    }
+
+    dma->first_buffer = (uint8_t *)m_realloc(dma->first_buffer, max_buffer_length);
+    if (dma->first_buffer == NULL) {
+        return AUDIO_DMA_MEMORY_ERROR;
+    }
+    dma->first_buffer_free = true;
+    if (!single_buffer) {
+        dma->second_buffer = (uint8_t *)m_realloc(dma->second_buffer, max_buffer_length);
+        if (dma->second_buffer == NULL) {
             return AUDIO_DMA_MEMORY_ERROR;
         }
-        dma->first_buffer_free = true;
-        if (!single_buffer) {
-            dma->second_buffer = (uint8_t *)m_realloc(dma->second_buffer, max_buffer_length);
-            if (dma->second_buffer == NULL) {
-                return AUDIO_DMA_MEMORY_ERROR;
-            }
-        }
-        dma->signed_to_unsigned = !output_signed && samples_signed;
-        dma->unsigned_to_signed = output_signed && !samples_signed;
     }
 
+    dma->signed_to_unsigned = !output_signed && samples_signed;
+    dma->unsigned_to_signed = output_signed && !samples_signed;
+
     dma->event_channel = 0xff;
     if (!single_buffer) {
         dma->second_descriptor = (DmacDescriptor *)m_malloc(sizeof(DmacDescriptor), false);

ports/atmel-samd/common-hal/audiobusio/I2SOut.c

@@ -71,7 +71,7 @@
 void i2sout_reset(void) {
     // Make sure the I2S peripheral is running so we can see if the resources we need are free.
     #ifdef SAM_D5X_E5X
-    // Connect the clock units to the 2mhz clock. It can't disable without it.
+    // Connect the clock units to the 2MHz clock. It can't disable without it.
     connect_gclk_to_peripheral(5, I2S_GCLK_ID_0);
     connect_gclk_to_peripheral(5, I2S_GCLK_ID_1);
     #endif
@@ -83,7 +83,7 @@ void i2sout_reset(void) {
 
     // Make sure the I2S peripheral is running so we can see if the resources we need are free.
     #ifdef SAM_D5X_E5X
-    // Connect the clock units to the 2mhz clock by default. They can't reset without it.
+    // Connect the clock units to the 2MHz clock by default. They can't reset without it.
     disconnect_gclk_from_peripheral(5, I2S_GCLK_ID_0);
     disconnect_gclk_from_peripheral(5, I2S_GCLK_ID_1);
 
@@ -222,7 +222,6 @@ void common_hal_audiobusio_i2sout_deinit(audiobusio_i2sout_obj_t *self) {
     reset_pin_number(self->word_select->number);
     self->word_select = NULL;
     reset_pin_number(self->data->number);
-    self->data = NULL;
 }
 
 void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self,
@@ -288,7 +287,7 @@ void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self,
     I2S->TXCTRL.reg = serctrl;
     #endif
 
-    // The DFLL is always a 48mhz clock
+    // The DFLL is always a 48MHz clock
     enable_clock_generator(self->gclk, CLOCK_48MHZ, divisor);
     connect_gclk_to_peripheral(self->gclk, I2S_GCLK_ID_0 + self->clock_unit);