Merge pull request #10529 from relic-se/audiomixer-mono

dhalbert · web-flow · commit 6ed41a0d2f74 · 2025-08-22T17:57:30.000-04:00
Added mono to stereo conversion and panning to `audiomixer.Mixer`
diff --git a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk
@@ -14,6 +14,7 @@ CIRCUITPY__EVE = 1
 CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_MSGPACK = 0
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_VECTORIO = 0
 
diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
@@ -10,11 +10,13 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY__EVE = 1
 CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
-CIRCUITPY_GIFIO = 0
 CIRCUITPY_JPEGIO = 0
-CIRCUITPY_TILEPALETTEMAPPER = 0
+CIRCUITPY_MSGPACK = 0
+CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_VECTORIO = 0
 
 CIRCUITPY_BITBANG_APA102 = 1
 
diff --git a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk
@@ -14,6 +14,7 @@ CIRCUITPY__EVE = 1
 CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_MSGPACK = 0
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_VECTORIO = 0
 
diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk b/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk
@@ -9,6 +9,14 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY__EVE = 1
+CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
-CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_JPEGIO = 0
+CIRCUITPY_MSGPACK = 0
+CIRCUITPY_PARALLELDISPLAYBUS = 0
+CIRCUITPY_RGBMATRIX = 0
+CIRCUITPY_SHARPDISPLAY = 0
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_VECTORIO = 0
diff --git a/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk b/ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.mk
@@ -9,4 +9,6 @@ CIRCUITPY_ESP_FLASH_SIZE = 2MB
 
 CIRCUITPY_DUALBANK = 0
 
+CIRCUITPY_JPEGIO = 0
+
 CIRCUITPY_ESP_USB_SERIAL_JTAG = 0
diff --git a/shared-bindings/audiomixer/MixerVoice.c b/shared-bindings/audiomixer/MixerVoice.c
@@ -114,6 +114,31 @@ MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj,
     (mp_obj_t)&audiomixer_mixervoice_get_level_obj,
     (mp_obj_t)&audiomixer_mixervoice_set_level_obj);
 
+//|     panning: synthio.BlockInput
+//|     """Defines the channel(s) in which the voice appears, as a floating point number between
+//|     -1 and 1. If your board does not support synthio, this property will only accept a float
+//|     value. This property is ignored if ``audiomixer.Mixer.channel_count=1``.
+//|
+//|     -1 is left channel only, 0 is both channels, and 1 is right channel. For fractional values,
+//|     the note plays at full amplitude in one channel and partial amplitude in the other channel.
+//|     For instance -.5 plays at full amplitude in the left channel and 1/2 amplitude in the right
+//|     channel."""
+static mp_obj_t audiomixer_mixervoice_obj_get_panning(mp_obj_t self_in) {
+    return common_hal_audiomixer_mixervoice_get_panning(self_in);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixervoice_get_panning_obj, audiomixer_mixervoice_obj_get_panning);
+
+static mp_obj_t audiomixer_mixervoice_obj_set_panning(mp_obj_t self_in, mp_obj_t panning_in) {
+    audiomixer_mixervoice_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    common_hal_audiomixer_mixervoice_set_panning(self, panning_in);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(audiomixer_mixervoice_set_panning_obj, audiomixer_mixervoice_obj_set_panning);
+
+MP_PROPERTY_GETSET(audiomixer_mixervoice_panning_obj,
+    (mp_obj_t)&audiomixer_mixervoice_get_panning_obj,
+    (mp_obj_t)&audiomixer_mixervoice_set_panning_obj);
+
 //|     loop: bool
 //|     """Get or set the loop status of the currently playing sample."""
 static mp_obj_t audiomixer_mixervoice_obj_get_loop(mp_obj_t self_in) {
@@ -158,6 +183,7 @@ static const mp_rom_map_elem_t audiomixer_mixervoice_locals_dict_table[] = {
     // Properties
     { MP_ROM_QSTR(MP_QSTR_playing), MP_ROM_PTR(&audiomixer_mixervoice_playing_obj) },
     { MP_ROM_QSTR(MP_QSTR_level), MP_ROM_PTR(&audiomixer_mixervoice_level_obj) },
+    { MP_ROM_QSTR(MP_QSTR_panning), MP_ROM_PTR(&audiomixer_mixervoice_panning_obj) },
     { MP_ROM_QSTR(MP_QSTR_loop), MP_ROM_PTR(&audiomixer_mixervoice_loop_obj) },
 };
 static MP_DEFINE_CONST_DICT(audiomixer_mixervoice_locals_dict, audiomixer_mixervoice_locals_dict_table);
diff --git a/shared-bindings/audiomixer/MixerVoice.h b/shared-bindings/audiomixer/MixerVoice.h
@@ -18,6 +18,8 @@ void common_hal_audiomixer_mixervoice_stop(audiomixer_mixervoice_obj_t *self);
 void common_hal_audiomixer_mixervoice_end(audiomixer_mixervoice_obj_t *self);
 mp_obj_t common_hal_audiomixer_mixervoice_get_level(audiomixer_mixervoice_obj_t *self);
 void common_hal_audiomixer_mixervoice_set_level(audiomixer_mixervoice_obj_t *self, mp_obj_t gain);
+mp_obj_t common_hal_audiomixer_mixervoice_get_panning(audiomixer_mixervoice_obj_t *self);
+void common_hal_audiomixer_mixervoice_set_panning(audiomixer_mixervoice_obj_t *self, mp_obj_t value);
 
 bool common_hal_audiomixer_mixervoice_get_playing(audiomixer_mixervoice_obj_t *self);
 
diff --git a/shared-module/audiocore/__init__.c b/shared-module/audiocore/__init__.c
@@ -196,12 +196,12 @@ void audiosample_convert_s16s_u8s(uint8_t *buffer_out, const int16_t *buffer_in,
     }
 }
 
-void audiosample_must_match(audiosample_base_t *self, mp_obj_t other_in) {
+void audiosample_must_match(audiosample_base_t *self, mp_obj_t other_in, bool allow_mono_to_stereo) {
     const audiosample_base_t *other = audiosample_check(other_in);
     if (other->sample_rate != self->sample_rate) {
         mp_raise_ValueError_varg(MP_ERROR_TEXT("The sample's %q does not match"), MP_QSTR_sample_rate);
     }
-    if (other->channel_count != self->channel_count) {
+    if ((!allow_mono_to_stereo || (allow_mono_to_stereo && self->channel_count != 2)) && other->channel_count != self->channel_count) {
         mp_raise_ValueError_varg(MP_ERROR_TEXT("The sample's %q does not match"), MP_QSTR_channel_count);
     }
     if (other->bits_per_sample != self->bits_per_sample) {
diff --git a/shared-module/audiocore/__init__.h b/shared-module/audiocore/__init__.h
@@ -89,7 +89,7 @@ static inline void audiosample_get_buffer_structure_checked(mp_obj_t self_in, bo
     audiosample_get_buffer_structure(audiosample_check(self_in), single_channel_output, single_buffer, samples_signed, max_buffer_length, spacing);
 }
 
-void audiosample_must_match(audiosample_base_t *self, mp_obj_t other);
+void audiosample_must_match(audiosample_base_t *self, mp_obj_t other, bool allow_mono_to_stereo);
 
 void audiosample_convert_u8m_s16s(int16_t *buffer_out, const uint8_t *buffer_in, size_t nframes);
 void audiosample_convert_u8s_s16s(int16_t *buffer_out, const uint8_t *buffer_in, size_t nframes);
diff --git a/shared-module/audiodelays/Chorus.c b/shared-module/audiodelays/Chorus.c
@@ -166,7 +166,7 @@ bool common_hal_audiodelays_chorus_get_playing(audiodelays_chorus_obj_t *self) {
 }
 
 void common_hal_audiodelays_chorus_play(audiodelays_chorus_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiodelays/Echo.c b/shared-module/audiodelays/Echo.c
@@ -204,7 +204,7 @@ bool common_hal_audiodelays_echo_get_playing(audiodelays_echo_obj_t *self) {
 }
 
 void common_hal_audiodelays_echo_play(audiodelays_echo_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiodelays/MultiTapDelay.c b/shared-module/audiodelays/MultiTapDelay.c
@@ -285,7 +285,7 @@ bool common_hal_audiodelays_multi_tap_delay_get_playing(audiodelays_multi_tap_de
 }
 
 void common_hal_audiodelays_multi_tap_delay_play(audiodelays_multi_tap_delay_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiodelays/PitchShift.c b/shared-module/audiodelays/PitchShift.c
@@ -143,7 +143,7 @@ bool common_hal_audiodelays_pitch_shift_get_playing(audiodelays_pitch_shift_obj_
 }
 
 void common_hal_audiodelays_pitch_shift_play(audiodelays_pitch_shift_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiofilters/Distortion.c b/shared-module/audiofilters/Distortion.c
@@ -141,7 +141,7 @@ bool common_hal_audiofilters_distortion_get_playing(audiofilters_distortion_obj_
 }
 
 void common_hal_audiofilters_distortion_play(audiofilters_distortion_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiofilters/Filter.c b/shared-module/audiofilters/Filter.c
@@ -143,7 +143,7 @@ bool common_hal_audiofilters_filter_get_playing(audiofilters_filter_obj_t *self)
 }
 
 void common_hal_audiofilters_filter_play(audiofilters_filter_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiofilters/Phaser.c b/shared-module/audiofilters/Phaser.c
@@ -130,7 +130,7 @@ bool common_hal_audiofilters_phaser_get_playing(audiofilters_phaser_obj_t *self)
 }
 
 void common_hal_audiofilters_phaser_play(audiofilters_phaser_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiofreeverb/Freeverb.c b/shared-module/audiofreeverb/Freeverb.c
@@ -195,7 +195,7 @@ bool common_hal_audiofreeverb_freeverb_get_playing(audiofreeverb_freeverb_obj_t
 }
 
 void common_hal_audiofreeverb_freeverb_play(audiofreeverb_freeverb_obj_t *self, mp_obj_t sample, bool loop) {
-    audiosample_must_match(&self->base, sample);
+    audiosample_must_match(&self->base, sample, false);
 
     self->sample = sample;
     self->loop = loop;
diff --git a/shared-module/audiomixer/Mixer.c b/shared-module/audiomixer/Mixer.c
diff --git a/shared-module/audiomixer/MixerVoice.c b/shared-module/audiomixer/MixerVoice.c
diff --git a/shared-module/audiomixer/MixerVoice.h b/shared-module/audiomixer/MixerVoice.h

Original file line number	Diff line number	Diff line change
`@@ -196,12 +196,12 @@ void audiosample_convert_s16s_u8s(uint8_t buffer_out, const int16_t buffer_in,`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`-void audiosample_must_match(audiosample_base_t *self, mp_obj_t other_in) {`
	`199`	`+void audiosample_must_match(audiosample_base_t *self, mp_obj_t other_in, bool allow_mono_to_stereo) {`
`200`	`200`	`const audiosample_base_t *other = audiosample_check(other_in);`
`201`	`201`	`if (other->sample_rate != self->sample_rate) {`
`202`	`202`	`mp_raise_ValueError_varg(MP_ERROR_TEXT("The sample's %q does not match"), MP_QSTR_sample_rate);`
`203`	`203`	`}`
`204`		`- if (other->channel_count != self->channel_count) {`
	`204`	`+ if ((!allow_mono_to_stereo \|\| (allow_mono_to_stereo && self->channel_count != 2)) && other->channel_count != self->channel_count) {`
`205`	`205`	`mp_raise_ValueError_varg(MP_ERROR_TEXT("The sample's %q does not match"), MP_QSTR_channel_count);`
`206`	`206`	`}`
`207`	`207`	`if (other->bits_per_sample != self->bits_per_sample) {`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ static inline void audiosample_get_buffer_structure_checked(mp_obj_t self_in, bo`
`89`	`89`	`audiosample_get_buffer_structure(audiosample_check(self_in), single_channel_output, single_buffer, samples_signed, max_buffer_length, spacing);`
`90`	`90`	`}`
`91`	`91`
`92`		`-void audiosample_must_match(audiosample_base_t *self, mp_obj_t other);`
	`92`	`+void audiosample_must_match(audiosample_base_t *self, mp_obj_t other, bool allow_mono_to_stereo);`
`93`	`93`
`94`	`94`	`void audiosample_convert_u8m_s16s(int16_t buffer_out, const uint8_t buffer_in, size_t nframes);`
`95`	`95`	`void audiosample_convert_u8s_s16s(int16_t buffer_out, const uint8_t buffer_in, size_t nframes);`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ bool common_hal_audiodelays_chorus_get_playing(audiodelays_chorus_obj_t *self) {`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`void common_hal_audiodelays_chorus_play(audiodelays_chorus_obj_t *self, mp_obj_t sample, bool loop) {`
`169`		`- audiosample_must_match(&self->base, sample);`
	`169`	`+ audiosample_must_match(&self->base, sample, false);`
`170`	`170`
`171`	`171`	`self->sample = sample;`
`172`	`172`	`self->loop = loop;`