audio_stream: fix a issue when used multiple tone stream

Author: xutao

components/audio_stream/include/tone_stream.h

@@ -43,6 +43,7 @@ typedef struct
     int task_stack;           /*!< Task stack size */
     int task_core;            /*!< Task running in core (0 or 1) */
     int task_prio;            /*!< Task priority (based on freeRTOS priority) */
+    const char *label;        /*!< Label of tone stored in flash. The default value is `flash_tone`*/
     bool extern_stack;        /*!< Task stack allocate on the extern ram */
     bool use_delegate;        /*!< Read tone partition with esp_delegate. If task stack is on extern ram, this MUST be TRUE */
 } tone_stream_cfg_t;
@@ -57,12 +58,13 @@ typedef struct
 
 #define TONE_STREAM_CFG_DEFAULT()               \
 {                                               \
-    .type = AUDIO_STREAM_NONE,                  \
-    .buf_sz = TONE_STREAM_BUF_SIZE,             \
-    .out_rb_size = TONE_STREAM_RINGBUFFER_SIZE, \
-    .task_stack = TONE_STREAM_TASK_STACK,       \
-    .task_core = TONE_STREAM_TASK_CORE,         \
-    .task_prio = TONE_STREAM_TASK_PRIO,         \
+    .type         = AUDIO_STREAM_NONE,          \
+    .buf_sz       = TONE_STREAM_BUF_SIZE,       \
+    .out_rb_size  = TONE_STREAM_RINGBUFFER_SIZE,\
+    .task_stack   = TONE_STREAM_TASK_STACK,     \
+    .task_core    = TONE_STREAM_TASK_CORE,      \
+    .task_prio    = TONE_STREAM_TASK_PRIO,      \
+    .label        = "flash_tone",               \
     .extern_stack = TONE_STREAM_EXT_STACK,      \
     .use_delegate = TONE_STREAM_USE_DELEGATE,   \
 }

components/audio_stream/tone_stream.c

@@ -44,18 +44,17 @@ typedef struct tone_stream {
     bool use_delegate;                   /*!< Tone read with delegate*/
     tone_partition_handle_t tone_handle; /*!< Tone partition's operation handle*/
     tone_file_info_t cur_file;           /*!< Address to read tone file */
+    const char *partition_label;         /*!< Label of tone stored in flash */
 } tone_stream_t;
 
-static const char *partition_label = "flash_tone";
-
 static esp_err_t _tone_open(audio_element_handle_t self)
 {
     tone_stream_t *stream = (tone_stream_t *)audio_element_getdata(self);
     if (stream->is_open) {
         ESP_LOGE(TAG, "already opened");
         return ESP_FAIL;
     }
-    stream->tone_handle = tone_partition_init(partition_label, stream->use_delegate);
+    stream->tone_handle = tone_partition_init(stream->partition_label, stream->use_delegate);
     if (stream->tone_handle == NULL) {
         return ESP_FAIL;
     }
@@ -177,6 +176,12 @@ audio_element_handle_t tone_stream_init(tone_stream_cfg_t *config)
     stream->type = config->type;
     stream->use_delegate = config->use_delegate;
 
+    if (config->label == NULL) {
+        ESP_LOGE(TAG, "Please set your tone label");
+        return NULL;
+    } else {
+        stream->partition_label = config->label;
+    }
     if (config->type == AUDIO_STREAM_READER) {
         cfg.read = _tone_read;
     } else if (config->type == AUDIO_STREAM_WRITER) {

examples/player/pipeline_flash_tone/main/play_tone_mp3_example.c

@@ -49,15 +49,18 @@ void app_main(void)
     tone_stream_cfg_t tone_cfg = TONE_STREAM_CFG_DEFAULT();
     tone_cfg.type = AUDIO_STREAM_READER;
     tone_stream_reader = tone_stream_init(&tone_cfg);
+    AUDIO_NULL_CHECK(TAG, tone_stream_reader, return);
 
     ESP_LOGI(TAG, "[2.2] Create i2s stream to write data to codec chip");
     i2s_stream_cfg_t i2s_cfg = I2S_STREAM_CFG_DEFAULT();
     i2s_cfg.type = AUDIO_STREAM_WRITER;
     i2s_stream_writer = i2s_stream_init(&i2s_cfg);
+    AUDIO_NULL_CHECK(TAG, i2s_stream_writer, return);
 
     ESP_LOGI(TAG, "[2.3] Create mp3 decoder to decode mp3 file");
     mp3_decoder_cfg_t mp3_cfg = DEFAULT_MP3_DECODER_CONFIG();
     mp3_decoder = mp3_decoder_init(&mp3_cfg);
+    AUDIO_NULL_CHECK(TAG, mp3_decoder, return);
 
     ESP_LOGI(TAG, "[2.4] Register all elements to audio pipeline");
     audio_pipeline_register(pipeline, tone_stream_reader, "tone");