Merge branch 'bugfix/fixed_dependent_module_ver' into 'main'

Fix dependent module version

See merge request adf/esp-webrtc-solution!24

Author: TempoTian

components/av_render/idf_component.yml

@@ -1,5 +1,5 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp_audio_codec: "*"
-  espressif/esp_video_codec: "*"
-  espressif/esp_audio_effects: "*"
+  espressif/esp_audio_codec: "~2.3.0"
+  espressif/esp_video_codec: "~0.5.2"
+  espressif/esp_audio_effects: "~1.1.0"

components/av_render/render_impl/idf_component.yml

@@ -1,7 +1,7 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp_codec_dev: "*"
-  espressif/esp_audio_effects: "*"
+  espressif/esp_codec_dev: "~1.3.4"
+  espressif/esp_audio_effects: "~1.1.0"
   av_render:
     path: ../
 

components/codec_board/idf_component.yml

@@ -1,10 +1,11 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp_codec_dev: "*"
+  espressif/esp_codec_dev: "~1.3.4"
   esp_lcd_ek79007:
+    version: "~1.0.2"
     rules:
       - if: "target in [esp32p4]"
   espressif/esp_lcd_ili9881c:
-    version: "*"
+    version: "~1.0.1"
     rules:
       - if: "target in [esp32p4]"

components/esp_capture/idf_component.yml

@@ -2,4 +2,4 @@ version: "0.0.1"
 description: Espressif Capture Library
 dependencies:
   idf : ">=4.4"
-  espressif/esp_muxer: "*"
+  espressif/esp_muxer: "~1.1.0"

components/esp_capture/include/esp_capture_defaults.h

@@ -45,7 +45,7 @@ typedef struct {
     int16_t  href_pin;   /*!< HREF pin */
     int16_t  pclk_pin;   /*!< PCLK pin */
     uint32_t xclk_freq;  /*!< XCLK frequency */
-    void    *i2c_master; /*!< I2C master handle*/
+    uint8_t  i2c_port;   /*!< I2C port for the initialized bus */
 } esp_capture_video_dvp_src_cfg_t;
 
 /**

components/esp_capture/src/impl/capture_audio_enc/capture_audio_enc.c

@@ -28,7 +28,8 @@
 #include "esp_capture_aenc_if.h"
 #include "esp_log.h"
 
-#define TAG "CAPTURE_AENC"
+#define TAG                              "CAPTURE_AENC"
+#define CAPTURE_AENC_DEF_FRAME_DURATION  (20) // Default audio frame duration
 
 typedef struct {
     esp_capture_aenc_if_t    base;
@@ -73,6 +74,7 @@ static int get_encoder_config(esp_audio_enc_config_t *enc_cfg, esp_capture_audio
         case ESP_CAPTURE_CODEC_TYPE_G711U: {
             esp_g711_enc_config_t *cfg = &all_cfg->g711_cfg;
             enc_cfg->cfg_sz = sizeof(esp_g711_enc_config_t);
+            cfg->frame_duration = CAPTURE_AENC_DEF_FRAME_DURATION; // Use default frame duration
             ASSIGN_BASIC_CFG(cfg);
             break;
         }
@@ -145,12 +147,7 @@ static int general_aenc_get_frame_size(esp_capture_aenc_if_t *h, int *in_frame_s
     }
     switch (aenc->info.codec) {
         case ESP_CAPTURE_CODEC_TYPE_G711A:
-        case ESP_CAPTURE_CODEC_TYPE_G711U: {
-            int samples = 20 * aenc->info.sample_rate / 1000;
-            *in_frame_size = samples * (aenc->info.channel * aenc->info.bits_per_sample >> 3);
-            *out_frame_size = *in_frame_size;
-            break;
-        }
+        case ESP_CAPTURE_CODEC_TYPE_G711U:
         case ESP_CAPTURE_CODEC_TYPE_AAC:
         case ESP_CAPTURE_CODEC_TYPE_OPUS:
             esp_audio_enc_get_frame_size(aenc->aenc_handle, in_frame_size, out_frame_size);

components/esp_capture/src/impl/capture_audio_enc/idf_component.yml

@@ -1,4 +1,4 @@
 dependencies:
-  espressif/esp_audio_codec: "*"
+  espressif/esp_audio_codec: "~2.3.0"
   esp_capture:
     path: ../../../../esp_capture

components/esp_capture/src/impl/capture_audio_src/idf_component.yml

@@ -1,5 +1,5 @@
 dependencies:
-  espressif/esp_codec_dev: "*"
+  espressif/esp_codec_dev: "~1.3.4"
   espressif/esp-sr: "1.9.5"
   esp_capture:
     path: ../../../../esp_capture

components/esp_capture/src/impl/capture_video_enc/idf_component.yml

@@ -1,4 +1,4 @@
 dependencies:
-  espressif/esp_video_codec: "*"
+  espressif/esp_video_codec: "~0.5.2"
   esp_capture:
     path: ../../../../esp_capture

components/esp_capture/src/impl/capture_video_src/capture_video_dvp_src.c

@@ -43,9 +43,6 @@ typedef struct {
     uint8_t                         cur_pic;
 } dvp_src_t;
 
-// Workaround for esp_camera
-static void *i2c_master;
-
 static int dvp_src_open(esp_capture_video_src_if_t *src)
 {
     return 0;
@@ -137,6 +134,7 @@ static int dvp_src_negotiate_caps(esp_capture_video_src_if_t *src, esp_capture_v
         .jpeg_quality = 12, // 0-63 lower number means higher quality
         .fb_count = dvp_src->cfg.buf_count,
         .grab_mode = CAMERA_GRAB_WHEN_EMPTY,
+        .sccb_i2c_port = dvp_src->cfg.i2c_port,
     };
     dvp_src->need_convert_420 = false;
     if (camera_config.xclk_freq_hz == 0) {
@@ -308,160 +306,11 @@ esp_capture_video_src_if_t *esp_capture_new_video_dvp_src(esp_capture_video_dvp_
     dvp->base.release_frame = dvp_src_release_frame;
     dvp->base.stop = dvp_src_stop;
     dvp->base.close = dvp_src_close;
-    i2c_master = cfg->i2c_master;
     dvp->cfg = *cfg;
     if (cfg->buf_count == 0) {
         dvp->cfg.buf_count = 1;
     }
     return &dvp->base;
 }
 
-// TODO hacking for IDFv5.3 for esp_camera not support i2c_master yet
-#if 1
-#include "sensor.h"
-#include "driver/i2c_master.h"
-
-static i2c_master_dev_handle_t dev_handle;
-static uint8_t i2c_addr;
-
-static int add_dev(uint8_t addr)
-{
-    if (addr == i2c_addr) {
-        return 0;
-    }
-    i2c_device_config_t dev_cfg = {
-        .dev_addr_length = I2C_ADDR_BIT_LEN_7,
-        .device_address = addr,
-        .scl_speed_hz = 100000,
-    };
-    int ret = i2c_master_bus_add_device(i2c_master, &dev_cfg, &dev_handle);
-    printf("Init for addr %x ret %d\n", addr, ret);
-    if (ret == 0) {
-        i2c_addr = addr;
-    }
-    return ret;
-}
-
-int SCCB_Init(int pin_sda, int pin_scl)
-{
-    ESP_LOGI(TAG, "pin_sda %d pin_scl %d", pin_sda, pin_scl);
-    return 0;
-}
-
-int SCCB_Use_Port(int i2c_num)
-{ // sccb use an already initialized I2C port
-    return 0;
-}
-
-int SCCB_Deinit(void)
-{
-    if (dev_handle) {
-        i2c_master_bus_rm_device(dev_handle);
-        i2c_addr = 0;
-        dev_handle = NULL;
-    }
-    return 0;
-}
-
-uint8_t SCCB_Probe(void)
-{
-    uint8_t slave_addr = 0x0;
-    for (size_t i = 0; i < CAMERA_MODEL_MAX; i++) {
-        if (slave_addr == camera_sensor[i].sccb_addr) {
-            continue;
-        }
-        slave_addr = camera_sensor[i].sccb_addr;
-        esp_err_t ret = i2c_master_probe(i2c_master, slave_addr, 100);
-        printf("Probe for %02x ret %d\n", slave_addr, ret);
-        if (ret == ESP_OK) {
-            return slave_addr;
-        }
-    }
-    return 0;
-}
-
-uint8_t SCCB_Read(uint8_t slv_addr, uint8_t reg)
-{
-    add_dev(slv_addr);
-    uint8_t addr_data[2] = { 0 };
-    addr_data[0] = (reg)&0xff;
-    uint8_t data = 0;
-    int ret = i2c_master_transmit_receive(dev_handle, addr_data, 1, &data, 1, 100);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "SCCB_Read Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret);
-    }
-    return data;
-}
-
-int SCCB_Write(uint8_t slv_addr, uint8_t reg, uint8_t data)
-{
-    add_dev(slv_addr);
-    uint8_t write_data[2] = { 0 };
-    write_data[0] = reg & 0xff;
-    write_data[1] = data;
-    esp_err_t ret = i2c_master_transmit(dev_handle, write_data, 2, 100);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "SCCB_Write Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret);
-    }
-    return ret == ESP_OK ? 0 : -1;
-}
-
-uint8_t SCCB_Read16(uint8_t slv_addr, uint16_t reg)
-{
-    add_dev(slv_addr);
-    uint8_t write_data[2] = { 0 };
-    write_data[0] = (reg & 0xff00) >> 8;
-    write_data[1] = reg & 0xff;
-    uint8_t data = 0;
-    int ret = i2c_master_transmit_receive(dev_handle, write_data, 2, &data, 1, 100);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "SCCB_Read Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret);
-    }
-    return data;
-}
-
-int SCCB_Write16(uint8_t slv_addr, uint16_t reg, uint8_t data)
-{
-    add_dev(slv_addr);
-    uint8_t write_data[3] = { 0 };
-    write_data[0] = (reg & 0xff00) >> 8;
-    write_data[1] = reg & 0xff;
-    write_data[2] = data;
-    esp_err_t ret = i2c_master_transmit(dev_handle, write_data, 3, 100);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "SCCB_Write Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret);
-    }
-    return ret == ESP_OK ? 0 : -1;
-}
-
-uint16_t SCCB_Read_Addr16_Val16(uint8_t slv_addr, uint16_t reg)
-{
-    uint16_t data = 0;
-    add_dev(slv_addr);
-    uint8_t addr_data[2] = { 0 };
-    addr_data[0] = (reg & 0xff00) >> 8;
-    addr_data[1] = reg & 0xff;
-    int ret = i2c_master_transmit_receive(dev_handle, addr_data, 2, (uint8_t *)&data, 2, 100);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "SCCB_Read Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret);
-    }
-    return ((data & 0xF) << 8 | (data & 0xFF));
-}
-
-int SCCB_Write_Addr16_Val16(uint8_t slv_addr, uint16_t reg, uint16_t data)
-{
-    add_dev(slv_addr);
-    uint8_t trans_data[4] = { 0 };
-    trans_data[0] = (reg & 0xff00) >> 8;
-    trans_data[1] = reg & 0xff;
-    trans_data[2] = (data & 0xff00) >> 8;
-    trans_data[3] = data & 0xff;
-    esp_err_t ret = i2c_master_transmit(dev_handle, trans_data, 4, 100);
-    if (ret != ESP_OK) {
-        ESP_LOGE(TAG, "SCCB_Write Failed addr:0x%02x, reg:0x%02x, data:0x%02x, ret:%d", slv_addr, reg, data, ret);
-    }
-    return ret == ESP_OK ? 0 : -1;
-}
-#endif
-
 #endif