Merge branch 'feat/esp32_mn2' into 'master'

bugfix(mn): fix the bug of multinet2

See merge request speech-recognition-framework/esp-sr!51

CHANGELOG.md

@@ -4,6 +4,10 @@
 - Available storage is less than the remaining flash space on IDF v5.0.   
 If you can not map model partition successfully, please check the left free storage by `spi_flash_mmap_get_free_pages(ESP_PARTITION_MMAP_DATA)` or update IDF to v5.1 or later.
 
+## unreleased
+- Fix the wrong APIs of multinet2 when using ESP32 chip
+- VAD can work fine when WakeNet is disabled
+
 ## 1.4.0
 - Add ci tests to check the APIs of wakenet, multinet and AFE work fine
 - Support to load and run two wakenet9 models at the same time in AFE

include/esp32/dl_lib_conv_queue.h

@@ -20,7 +20,7 @@ typedef float fptp_t;
 
 
 //Flags for matrices
-#define DL_MF_FOREIGNDATA (1<<0)  /*< Matrix *item data actually points to another matrix and should not be freed */
+// #define DL_MF_FOREIGNDATA (0)  /*< Matrix *item data actually points to another matrix and should not be freed */
 
 //Float convolution FIFO queue. 
 typedef struct {
@@ -40,6 +40,15 @@ typedef struct {
  */
 dl_conv_queue_t *dl_conv_queue_alloc(int n, int c);
 
+/**
+ * @brief Allocate a convolution queue from psram
+ *
+ * @param n     The length of queue
+ * @param c     The channel number of elements in the queue
+ * @return      The convolution queue, or NULL if out of memory
+ */
+dl_conv_queue_t *dl_conv_queue_alloc_from_psram(int n, int c);
+
 /**
  * @brief Free a convolution queue
  *

include/esp32/dl_lib_convq8_queue.h

@@ -50,6 +50,16 @@ dl_convq8_queue_t *dl_convq8_queue_alloc(int n, int c);
  */
 dl_convq8_queue_t *dl_convq8_queue_alloc_mc(int n, int c, int nch);
 
+/**
+ * @brief Allocate a bit fixed-point convolution queue from PSRAM
+ *
+ * @param n     The length of queue
+ * @param c     The number of elements in the queue
+ * @param nch     The channel of queue
+ * @return      The convolution queue, or NULL if out of memory
+ */
+dl_convq8_queue_t *dl_convq8_queue_alloc_mc_from_psram(int n, int c, int nch);
+
 /**
  * @brief Free a fixed-point convolution queue
  *
@@ -64,6 +74,16 @@ void dl_convq8_queue_free(dl_convq8_queue_t *cq);
  */
 void dl_convq8_queue_bzero(dl_convq8_queue_t *cqm);
 
+/**
+ * @brief Move the front pointer of queue forward, 
+          the First(oldest) element become the last(newest) element, 
+ *
+ * @param cq    Input fixed-point convolution queue
+ * @return      Pointer of oldest element  
+ */
+q8tp_t *dl_convq8_queue_pop(dl_convq8_queue_t *cq);
+q8tp_t *dl_convq8_queue_popn(dl_convq8_queue_t *cq, int n);
+
 /**
  * @brief  Insert the float-point element at the end of queue.
  *         The precision of fixed-point numbers is described by the Qm.f notation,  

include/esp32/dl_lib_convq_queue.h

@@ -93,8 +93,8 @@ void dl_convq_queue_bzero(dl_convq_queue_t *cq);
  * @param cq    Input fixed-point convolution queue
  * @return      Pointer of oldest element  
  */
-inline qtp_t *dl_convq_queue_pop(dl_convq_queue_t *cq);
-inline qtp_t *dl_convq_queue_popn(dl_convq_queue_t *cq, int n);
+qtp_t *dl_convq_queue_pop(dl_convq_queue_t *cq);
+qtp_t *dl_convq_queue_popn(dl_convq_queue_t *cq, int n);
 /**
  * @brief  Remove the oldest element, then insert the input element at the end of queue
  *
@@ -125,7 +125,7 @@ dl_conv_queue_t *dl_queue_from_convq(dl_convq_queue_t *cq1);
  * @param last_num  Offset from the front of the queue
  * @return          Pointer of the element
  */
-inline qtp_t *dl_get_queue_itemq(dl_convq_queue_t *cq, int last_num);
+qtp_t *dl_get_queue_itemq(dl_convq_queue_t *cq, int last_num);
 
 /**
  * @brief   Get the pointer of element in the queue by offset

include/esp32/dl_lib_matrix.h

@@ -32,7 +32,8 @@ extern multi_heap_handle_t gst_heap;
 #endif
 
 //Flags for matrices
-#define DL_MF_FOREIGNDATA (1<<0)  /*< Matrix *item data actually points to another matrix and should not be freed */
+#define DL_MF_FOREIGNDATA 1  /*< Matrix pointer and item data actually points to another matrix and should not be freed */
+#define DL_MF_FOREIGNITEM 2  /*< Only item data actually points to another matrix and should not be freed */
 
 //'Normal' float matrix
 typedef struct {

include/esp32/esp_afe_config.h

@@ -64,7 +64,8 @@ typedef struct {
     bool voice_communication_agc_init;      // AGC swich for voice communication
     int voice_communication_agc_gain;       // AGC gain(dB) for voice communication
     vad_mode_t vad_mode;                    // The value can be: VAD_MODE_0, VAD_MODE_1, VAD_MODE_2, VAD_MODE_3, VAD_MODE_4
-    char *wakenet_model_name;               // The model name of wakenet
+    char *wakenet_model_name;               // The model name of wakenet 1
+    char *wakenet_model_name_2;             // The model name of wakenet 2 if has wakenet 2
     det_mode_t wakenet_mode;
     afe_sr_mode_t afe_mode;
     int afe_perferred_core;
@@ -89,6 +90,7 @@ typedef struct {
     .voice_communication_agc_gain = 15, \
     .vad_mode = VAD_MODE_3, \
     .wakenet_model_name = NULL, \
+    .wakenet_model_name_2 = NULL, \
     .wakenet_mode = DET_MODE_90, \
     .afe_mode = SR_MODE_HIGH_PERF, \
     .afe_perferred_core = 0, \
@@ -114,6 +116,7 @@ typedef struct {
     .voice_communication_agc_gain = 15, \
     .vad_mode = VAD_MODE_3, \
     .wakenet_model_name = NULL, \
+    .wakenet_model_name_2 = NULL, \
     .wakenet_mode = DET_MODE_2CH_90, \
     .afe_mode = SR_MODE_LOW_COST, \
     .afe_perferred_core = 0, \

include/esp32/esp_afe_sr_iface.h

@@ -27,6 +27,7 @@ typedef struct afe_fetch_result_t
     int data_size;                          // the size of data. The unit is byte.
     wakenet_state_t wakeup_state;           // the value is wakenet_state_t
     int wake_word_index;                    // if the wake word is detected. It will store the wake word index which start from 1.
+    int wakenet_model_index;                // if there are multiple wakenets, this value identifies which model be wakes up. Index start from 1.
     afe_vad_state_t vad_state;              // the value is afe_vad_state_t
     int trigger_channel_id;                 // the channel index of output
     int wake_word_length;                   // the length of wake word. It's unit is the number of samples.
@@ -111,7 +112,7 @@ typedef int (*esp_afe_sr_iface_op_reset_buffer_t)(esp_afe_sr_data_t *afe);
 
 /**
  * @brief Initial wakenet and wake words coefficient, or reset wakenet and wake words coefficient 
- *        when wakenet has been initialized.  
+ *        when wakenet has been initialized. It's only support wakenet 1 now.
  *
  * @param afe                The AFE_SR object to query
  * @param wakenet_word       The wakenet word, should be DEFAULT_WAKE_WORD or EXTRA_WAKE_WORD

libversion

@@ -1 +0,0 @@
-187f935f