mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Merge pull request #1435 from openmv/rp2_audio_update2
RP2: Fix audio deinit.
This commit is contained in:
commit
7912ee8542
@ -65,6 +65,7 @@ typedef struct _audio_data_t {
|
|||||||
void (*pdm_filter_func) (uint8_t*, int16_t*, uint16_t, TPDMFilter_InitStruct*);
|
void (*pdm_filter_func) (uint8_t*, int16_t*, uint16_t, TPDMFilter_InitStruct*);
|
||||||
} audio_data_t;
|
} audio_data_t;
|
||||||
|
|
||||||
|
static bool audio_initialized = false;
|
||||||
#define audio_data MP_STATE_PORT(audio_data)
|
#define audio_data MP_STATE_PORT(audio_data)
|
||||||
#define NEXT_BUFFER(x) (((x) + 1) % (audio_data->n_buffers))
|
#define NEXT_BUFFER(x) (((x) + 1) % (audio_data->n_buffers))
|
||||||
|
|
||||||
@ -298,6 +299,7 @@ static mp_obj_t py_audio_init(uint n_args, const mp_obj_t *pos_args, mp_map_t *k
|
|||||||
irq_set_enabled(PDM_DMA_IRQ, true);
|
irq_set_enabled(PDM_DMA_IRQ, true);
|
||||||
dma_irqn_set_channel_enabled(PDM_DMA, audio_data->dma_channel, true);
|
dma_irqn_set_channel_enabled(PDM_DMA, audio_data->dma_channel, true);
|
||||||
|
|
||||||
|
audio_initialized = true;
|
||||||
return mp_const_none;
|
return mp_const_none;
|
||||||
}
|
}
|
||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_audio_init_obj, 0, py_audio_init);
|
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_audio_init_obj, 0, py_audio_init);
|
||||||
@ -344,6 +346,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(py_audio_start_streaming_obj, py_audio_start_st
|
|||||||
|
|
||||||
static mp_obj_t py_audio_stop_streaming()
|
static mp_obj_t py_audio_stop_streaming()
|
||||||
{
|
{
|
||||||
|
if (audio_data->streaming) {
|
||||||
// Disable PDM and IRQ
|
// Disable PDM and IRQ
|
||||||
dma_channel_abort(audio_data->dma_channel);
|
dma_channel_abort(audio_data->dma_channel);
|
||||||
dma_irqn_set_channel_enabled(PDM_DMA, audio_data->dma_channel, false);
|
dma_irqn_set_channel_enabled(PDM_DMA, audio_data->dma_channel, false);
|
||||||
@ -363,6 +366,8 @@ static mp_obj_t py_audio_stop_streaming()
|
|||||||
mp_printf(&mp_plat_print, "Average conversion time:%ld us\n",
|
mp_printf(&mp_plat_print, "Average conversion time:%ld us\n",
|
||||||
(audio_data->conv_total / audio_data->conv_times));
|
(audio_data->conv_total / audio_data->conv_times));
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
return mp_const_none;
|
return mp_const_none;
|
||||||
}
|
}
|
||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_0(py_audio_stop_streaming_obj, py_audio_stop_streaming);
|
STATIC MP_DEFINE_CONST_FUN_OBJ_0(py_audio_stop_streaming_obj, py_audio_stop_streaming);
|
||||||
@ -409,6 +414,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(py_audio_get_buffer_obj, 0, py_audio_get_buffe
|
|||||||
|
|
||||||
void py_audio_deinit()
|
void py_audio_deinit()
|
||||||
{
|
{
|
||||||
|
if (audio_initialized) {
|
||||||
py_audio_stop_streaming();
|
py_audio_stop_streaming();
|
||||||
audio_data->head = 0;
|
audio_data->head = 0;
|
||||||
audio_data->tail = 0;
|
audio_data->tail = 0;
|
||||||
@ -421,11 +427,16 @@ void py_audio_deinit()
|
|||||||
audio_data->overflow = false;
|
audio_data->overflow = false;
|
||||||
audio_data->abort_on_overflow = false;
|
audio_data->abort_on_overflow = false;
|
||||||
audio_data->user_callback = mp_const_none;
|
audio_data->user_callback = mp_const_none;
|
||||||
|
|
||||||
if (audio_data->dma_channel >= 0) {
|
if (audio_data->dma_channel >= 0) {
|
||||||
dma_channel_unclaim(audio_data->dma_channel);
|
dma_channel_unclaim(audio_data->dma_channel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
audio_data = MP_OBJ_NULL;
|
||||||
|
audio_initialized = false;
|
||||||
|
}
|
||||||
|
|
||||||
static const mp_rom_map_elem_t globals_dict_table[] = {
|
static const mp_rom_map_elem_t globals_dict_table[] = {
|
||||||
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audio) },
|
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_audio) },
|
||||||
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&py_audio_init_obj) },
|
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&py_audio_init_obj) },
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user