aec with dual mic and volume buttons

dependencies.lock

@@ -6,7 +6,7 @@ dependencies:
       require: private
       version: '>=5.0'
     source:
-      registry_url: https://components.espressif.com/
+      registry_url: https://components.espressif.com
       type: service
     version: 1.7.19~2
   espressif/dl_fft:
@@ -16,9 +16,37 @@ dependencies:
       require: private
       version: '>=5.0'
     source:
-      registry_url: https://components.espressif.com/
+      registry_url: https://components.espressif.com
       type: service
     version: 0.6.0
+  espressif/esp-dl:
+    component_hash: 0d5dd7fadd04854a82e1404f871e16980002a46dfe9796e52626d3c8d6566ad2
+    dependencies:
+    - name: espressif/dl_fft
+      registry_url: https://components.espressif.com
+      require: private
+      version: '>=0.6.0'
+    - name: espressif/esp_new_jpeg
+      registry_url: https://components.espressif.com
+      require: private
+      version: ^1
+    - name: idf
+      require: private
+      version: '*'
+    source:
+      registry_url: https://components.espressif.com
+      type: service
+    targets:
+    - esp32
+    - esp32c2
+    - esp32c3
+    - esp32c5
+    - esp32c6
+    - esp32p4
+    - esp32s2
+    - esp32s3
+    - esp32s31
+    version: 3.3.9
   espressif/esp-dsp:
     component_hash: 12e44db246517a627bc0fe2b255b8335410c0215c98bfba2df5a8e3edea839ef
     dependencies:
@@ -26,17 +54,37 @@ dependencies:
       require: private
       version: '>=4.2'
     source:
-      registry_url: https://components.espressif.com/
+      registry_url: https://components.espressif.com
       type: service
     version: 1.8.0
   espressif/esp-sr:
-    dependencies: []
+    component_hash: 803a3e2917f5100f6ce5766373d29c269ce32b9c6b33ca948548bc94ad752ef1
+    dependencies:
+    - name: espressif/cjson
+      registry_url: https://components.espressif.com
+      require: private
+      version: ^1.7.19
+    - name: espressif/dl_fft
+      registry_url: https://components.espressif.com
+      require: private
+      version: '>=0.6.0'
+    - name: espressif/esp-dl
+      registry_url: https://components.espressif.com
+      require: private
+      version: '>=3.3.9'
+    - name: espressif/esp-dsp
+      registry_url: https://components.espressif.com
+      require: private
+      version: 1.8.0
+    - name: idf
+      require: private
+      version: '>=5.0'
     source:
-      path: C:\Users\doop3\OneDrive\Documents\espidfprojects\SIP_test2_1\SIP_test2\components\espressif__esp-sr
-      type: local
-    version: 2.4.6
+      registry_url: https://components.espressif.com/
+      type: service
+    version: 2.5.0
   espressif/esp_codec_dev:
-    component_hash: 8a58569aed3c6e8d858da5419eba4d54ee905d7709cdbe01c42101c1ed0c5319
+    component_hash: 4779f31a3ba3f9b38aee1afe6ccb9ba8f6108dc3a6e77d39d7d714e9a215371b
     dependencies:
     - name: idf
       require: private
@@ -44,7 +92,7 @@ dependencies:
     source:
       registry_url: https://components.espressif.com/
       type: service
-    version: 1.6.1
+    version: 1.6.2
   espressif/esp_io_expander:
     component_hash: 7b7f91270172e46ca4597e3874f48d8412e280e8c295559f5922ec38656e3e5f
     dependencies:
@@ -69,6 +117,25 @@ dependencies:
       registry_url: https://components.espressif.com/
       type: service
     version: 2.0.2
+  espressif/esp_new_jpeg:
+    component_hash: e1e7e6991193c41ed6c9fc386702aa7821433319e7aa9c3147cd3236310cd69c
+    dependencies: []
+    source:
+      registry_url: https://components.espressif.com
+      type: service
+    targets:
+    - esp32
+    - esp32s2
+    - esp32s3
+    - esp32s31
+    - esp32p4
+    - esp32c2
+    - esp32c3
+    - esp32c5
+    - esp32c6
+    - esp32c61
+    - esp32h4
+    version: 1.0.2
   espressif/led_strip:
     component_hash: 28621486f77229aaf81c71f5e15d6fbf36c2949cf11094e07090593e659e7639
     dependencies:
@@ -84,14 +151,10 @@ dependencies:
       type: idf
     version: 5.3.5
 direct_dependencies:
-- espressif/cjson
-- espressif/dl_fft
-- espressif/esp-dsp
 - espressif/esp-sr
 - espressif/esp_codec_dev
 - espressif/esp_io_expander_tca95xx_16bit
 - espressif/led_strip
-- idf
-manifest_hash: 2e8c992a35dd97ed7aa093a6dede2214b63671f1dbf36fba70a42539f89df49a
+manifest_hash: cc6725c3be0ea7fd83b3ab5f9e00bbc374e48bbe22994003311ddb44aa92bcbe
 target: esp32s3
 version: 2.0.0

main/sip/sip.c

@@ -29,11 +29,7 @@
 #include "esp_g711_enc.h"
 #include "esp_g711_dec.h"*/
 
-<<<<<<< HEAD
-#define ESP32_IP ""
-=======
 #define ESP32_IP "192.168.68.67"
->>>>>>> 808cdc8 (aec and volume buttons implemented)
 #define RTP_PORT 4000
 
 #define WIFI_SSID ""
@@ -523,10 +519,6 @@ ESP_LOGI(TAG,
     return;
 }
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 808cdc8 (aec and volume buttons implemented)
     if(s_rtp_sock < 0)
     {
         s_rtp_sock = socket(AF_INET,
@@ -577,19 +569,6 @@ else
     int16_t near_end[MIC_FRAME_SAMPLES];
     int16_t far_end[MIC_FRAME_SAMPLES];
 
-<<<<<<< HEAD
-// Convert 32-bit audio to PCM16
-for(int i = 0; i < SAMPLES_PER_PACKET; i++)
-{
-    // Take microphone channel
-int32_t s = mic_buffer[i * 2];
-
-// Trying these one at a time
-//mic_pcm16[i] = s >> 16;
- //mic_pcm16[i] = s >> 15;
- mic_pcm16[i] = s >> 14;
-}
-=======
     for (int i = 0; i < MIC_FRAME_SAMPLES; ++i) {
         int32_t left = mic16[i * 2];
         int32_t right = mic16[i * 2 + 1];
@@ -601,7 +580,6 @@ int32_t s = mic_buffer[i * 2];
         !aec_output_pop(mic_pcm16, SAMPLES_PER_PACKET)) {
         return;
     }
->>>>>>> 808cdc8 (aec and volume buttons implemented)
 
 
 // Debug microphone level
@@ -848,9 +826,6 @@ static void rtp_rx_task(void *pvParameters)
     continue;
 }
 
-<<<<<<< HEAD
-ESP_LOGI(TAG, "Received RTP packet (%d bytes)", n);
-=======
 if (s_rtp_peer_port != 0 &&
     (src.sin_port != htons(s_rtp_peer_port) ||
      src.sin_addr.s_addr != s_rtp_peer.sin_addr.s_addr))
@@ -873,7 +848,6 @@ if (src.sin_addr.s_addr == local_ip.ip.addr)
 }
 
 // ESP_LOGI(TAG, "Received RTP packet (%d bytes)", n);
->>>>>>> 808cdc8 (aec and volume buttons implemented)
 
 if (n <= 12)
 {

sdkconfig

@@ -2411,6 +2411,31 @@ CONFIG_CJSON_CIRCULAR_LIMIT=10000
 # end of cJSON
 
 #
+# ESP-DL Configuration
+#
+
+#
+# Vision/Image: Pixel Convert Support
+#
+CONFIG_PIX_CVT_RGB565_TO_RGB565_SUPPORT=y
+CONFIG_PIX_CVT_RGB565_TO_RGB888_SUPPORT=y
+CONFIG_PIX_CVT_RGB565_TO_GRAY_SUPPORT=y
+CONFIG_PIX_CVT_RGB565_TO_HSV_SUPPORT=y
+CONFIG_PIX_CVT_RGB888_TO_RGB888_SUPPORT=y
+CONFIG_PIX_CVT_RGB888_TO_RGB565_SUPPORT=y
+CONFIG_PIX_CVT_RGB888_TO_GRAY_SUPPORT=y
+CONFIG_PIX_CVT_RGB888_TO_HSV_SUPPORT=y
+CONFIG_PIX_CVT_GRAY_TO_GRAY_SUPPORT=y
+CONFIG_PIX_CVT_HSV_TO_HSV_MASK_SUPPORT=y
+CONFIG_PIX_CVT_YUV_TO_RGB888_SUPPORT=y
+CONFIG_PIX_CVT_YUV_TO_RGB565_SUPPORT=y
+CONFIG_PIX_CVT_YUV_TO_GRAY_SUPPORT=y
+CONFIG_PIX_CVT_YUV_TO_HSV_SUPPORT=y
+CONFIG_PIX_CVT_YUV_TO_YUV_SUPPORT=y
+# end of Vision/Image: Pixel Convert Support
+# end of ESP-DL Configuration
+
+#
 # DSP Library
 #
 CONFIG_DSP_OPTIMIZATIONS_SUPPORTED=y