Merge branch 'bugfix/fix_host_candidate_gather' into 'main'

Fix host candidate not found

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

Author: TempoTian

components/esp_capture/src/impl/capture_simple_path/esp_capture_path_simple.c

@@ -336,7 +336,7 @@ static void simple_capture_venc_thread(void *arg)
         capture->src_cfg.release_src_frame(capture->src_cfg.src_ctx, &frame);
         if (ret != ESP_CAPTURE_ERR_OK) {
             if (ret == ESP_CAPTURE_ERR_NOT_ENOUGH) {
-                ESP_LOGW(TAG, "Bad input maybe skipped");
+                ESP_LOGW(TAG, "Bad input maybe skipped size %d", (int)res->video_frame_size);
                 continue;
             }
             ESP_LOGE(TAG, "Fail to encode video frame");

components/esp_capture/src/impl/capture_video_enc/capture_video_enc.c

@@ -106,7 +106,7 @@ static int venc_get_frame_size(esp_capture_venc_if_t *h, int *in_frame_size, int
     if (venc->info.codec == ESP_CAPTURE_CODEC_TYPE_MJPEG) {
         *out_frame_size = *in_frame_size / 20;
     } else if (venc->info.codec == ESP_CAPTURE_CODEC_TYPE_H264) {
-        *out_frame_size = *in_frame_size / 2;
+        *out_frame_size = *in_frame_size;
         *out_frame_size = ALIGN_UP(*out_frame_size, 128);
     } else {
         return ESP_CAPTURE_ERR_NOT_SUPPORTED;

components/esp_webrtc/impl/apprtc_signal/https_client.c

@@ -116,6 +116,7 @@ int https_send_request(const char *method, char **headers, const char *url, char
         .event_handler = _http_event_handler,
         .crt_bundle_attach = esp_crt_bundle_attach,
         .user_data = &info,
+        .timeout_ms = 10000, // Change default timeout to be 10s
     };
     esp_http_client_handle_t client = esp_http_client_init(&config);
     if (client == NULL) {

components/esp_webrtc/impl/peer_default/libs/esp32/libpeer_default.a

@@ -667,6 +667,20 @@ int esp_webrtc_open(esp_webrtc_cfg_t *cfg, esp_webrtc_handle_t *handle)
     rtc->rtc_cfg.peer_cfg.server_num = 0;
     rtc->rtc_cfg.peer_cfg.server_lists = NULL;
     malloc_server_cfg(rtc, cfg->peer_cfg.server_lists, cfg->peer_cfg.server_num);
+    if (cfg->peer_cfg.extra_cfg) {
+        void *peer_exta_cfg = calloc(1, cfg->peer_cfg.extra_size);
+        if (peer_exta_cfg) {
+            memcpy(peer_exta_cfg, cfg->peer_cfg.extra_cfg, cfg->peer_cfg.extra_size);
+        }
+        rtc->rtc_cfg.peer_cfg.extra_cfg = peer_exta_cfg;
+    }
+    if (cfg->signaling_cfg.extra_cfg) {
+        void *signaling_cfg = calloc(1, cfg->signaling_cfg.extra_size);
+        if (signaling_cfg) {
+            memcpy(signaling_cfg, cfg->signaling_cfg.extra_cfg, cfg->signaling_cfg.extra_size);
+        }
+        rtc->rtc_cfg.signaling_cfg.extra_cfg = signaling_cfg;
+    }
     *handle = rtc;
     return ESP_PEER_ERR_NONE;
 }
@@ -858,6 +872,8 @@ int esp_webrtc_close(esp_webrtc_handle_t handle)
     webrtc_t *rtc = (webrtc_t *)handle;
     esp_webrtc_stop(handle);
     free_server_cfg(rtc);
+    SAFE_FREE(rtc->rtc_cfg.peer_cfg.extra_cfg);
+    SAFE_FREE(rtc->rtc_cfg.signaling_cfg.extra_cfg);
     SAFE_FREE(rtc->aud_fifo);
     free(rtc);
     return ESP_PEER_ERR_NONE;

components/esp_webrtc/impl/peer_default/libs/esp32p4/libpeer_default.a

@@ -41,6 +41,8 @@ static char room_url[128];
     }                                   \
     media_lib_thread_create_from_scheduler(NULL, #name, run_async##name, NULL);
 
+char server_url[64] = "https://webrtc.espressif.com";
+
 static int join_room(int argc, char **argv)
 {
     int nerrors = arg_parse(argc, argv, (void **)&room_args);
@@ -55,7 +57,7 @@ static int join_room(int argc, char **argv)
         }
     }
     const char *room_id = room_args.room_id->sval[0];
-    snprintf(room_url, sizeof(room_url), "https://webrtc.espressif.cn/join/%s", room_id);
+    snprintf(room_url, sizeof(room_url), "%s/join/%s", server_url, room_id);
     ESP_LOGI(TAG, "Start to join in room %s", room_id);
     start_webrtc(room_url);
     return 0;
@@ -95,6 +97,18 @@ static int wifi_cli(int argc, char **argv)
     return network_connect_wifi(ssid, password);
 }
 
+static int server_cli(int argc, char **argv)
+{
+    int server_sel = argc > 1 ? atoi(argv[1]) : 0;
+    if (server_sel == 0) {
+        strcpy(server_url, "https://webrtc.espressif.com");
+    } else {
+        strcpy(server_url, "https://webrtc.espressif.cn");
+    }
+    ESP_LOGI(TAG, "Select server %s", server_url);
+    return 0;
+}
+
 static int capture_to_player_cli(int argc, char **argv)
 {
     return test_capture_to_player();
@@ -174,6 +188,11 @@ static int init_console()
             .help = "measure system loading\r\n",
             .func = measure_cli,
         },
+         {
+            .command = "server",
+            .help = "Select server\r\n",
+            .func = server_cli,
+        },
     };
     for (int i = 0; i < sizeof(cmds) / sizeof(cmds[0]); i++) {
         ESP_ERROR_CHECK(esp_console_cmd_register(&cmds[i]));
@@ -221,10 +240,10 @@ static int network_event_handler(bool connected)
         // Enter into Room directly
         RUN_ASYNC(start, {
             char *room = gen_room_id_use_mac();
-            snprintf(room_url, sizeof(room_url), "https://webrtc.espressif.cn/join/%s", room);
+            snprintf(room_url, sizeof(room_url), "%s/join/%s", server_url, room);
             ESP_LOGI(TAG, "Start to join in room %s", room);
             if (start_webrtc(room_url) == 0) {
-                ESP_LOGW(TAG, "Please use browser to join in %s on https://webrtc.espressif.cn/doorbell", room);
+                ESP_LOGW(TAG, "Please use browser to join in %s on %s/webrtc.espressif.cn/doorbell", server_url, room);
             }
         });
     } else {