Merge branch 'feature/support_whip_protocol' into 'main'

Add WHIP signaling support

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

Author: TempoTian

README.md

@@ -25,3 +25,6 @@ This demo mainly show how to use `esp_peer` API to buildup a WebRTC application
 
 ### 4. Video Call Solution
 This demo show how to use `esp_webrtc` data channel to build up video call application.
+
+### 5. WHIP Publisher Solution
+This demo show how to use `esp_webrtc` to publish streaming data to WHIP server.

components/av_render/src/av_render.c

@@ -608,7 +608,7 @@ static int _render_write_audio(av_render_thread_res_t *res, av_render_audio_fram
     if (res->flushing == false) {
         ret = audio_render_write(res->render->cfg.audio_render, audio_frame);
         if (ret != 0) {
-            ESP_LOGE(TAG, "Fail to render audio");
+            ESP_LOGE(TAG, "Fail to render audio ret %d", ret);
             return ret;
         }
     }

components/esp_webrtc/CMakeLists.txt

@@ -2,8 +2,8 @@
 set(component_srcdirs "src")
 
 # AppRTC
-set(signalling_srcdirs  "impl/apprtc_signal")
-set(signalling_incdirs  "impl/apprtc_signal")
+set(signalling_srcdirs  "impl/apprtc_signal" "impl/whip_signal")
+set(signalling_incdirs  "impl/apprtc_signal" "impl/whip_signal/include")
 
 list(APPEND component_srcdirs ${signalling_srcdirs})
 

components/esp_webrtc/impl/apprtc_signal/https_client.c

@@ -33,11 +33,12 @@
 static const char *TAG = "HTTPS_CLIENT";
 
 typedef struct {
-    http_body_t body;
-    uint8_t    *data;
-    int         fill_size;
-    int         size;
-    void       *ctx;
+    http_header_t header;
+    http_body_t   body;
+    uint8_t      *data;
+    int           fill_size;
+    int           size;
+    void         *ctx;
 } http_info_t;
 
 esp_err_t _http_event_handler(esp_http_client_event_t *evt)
@@ -54,6 +55,9 @@ esp_err_t _http_event_handler(esp_http_client_event_t *evt)
             ESP_LOGD(TAG, "HTTP_EVENT_HEADER_SENT");
             break;
         case HTTP_EVENT_ON_HEADER:
+            if (info->header) {
+                info->header(evt->header_key, evt->header_value, info->ctx);
+            }
             ESP_LOGD(TAG, "HTTP_EVENT_ON_HEADER, key=%s, value=%s", evt->header_key,
                      evt->header_value);
             break;
@@ -100,10 +104,11 @@ esp_err_t _http_event_handler(esp_http_client_event_t *evt)
     return ESP_OK;
 }
 
-int https_send_request(const char *method, char **headers, const char *url, char *data, http_body_t body, void *ctx)
+int https_send_request(const char *method, char **headers, const char *url, char *data, http_header_t header_cb, http_body_t body, void *ctx)
 {
     http_info_t info = {
         .body = body,
+        .header = header_cb,
         .ctx = ctx,
     };
     esp_http_client_config_t config = {
@@ -124,6 +129,8 @@ int https_send_request(const char *method, char **headers, const char *url, char
         esp_http_client_set_method(client, HTTP_METHOD_POST);
     } else if (strcmp(method, "DELETE") == 0) {
         esp_http_client_set_method(client, HTTP_METHOD_DELETE);
+    } else if (strcmp(method, "PATCH") == 0) {
+        esp_http_client_set_method(client, HTTP_METHOD_PATCH);
     } else {
         err = -1;
         goto _exit;
@@ -168,7 +175,7 @@ int https_send_request(const char *method, char **headers, const char *url, char
     return err;
 }
 
-int https_post(const char *url, char **headers, char *data, http_body_t body, void *ctx)
+int https_post(const char *url, char **headers, char *data, http_header_t header_cb, http_body_t body, void *ctx)
 {
-    return https_send_request("POST", headers, url, data, body, ctx);
+    return https_send_request("POST", headers, url, data, header_cb, body, ctx);
 }

components/esp_webrtc/impl/apprtc_signal/https_client.h

@@ -44,40 +44,51 @@ typedef struct {
  */
 typedef void (*http_body_t)(http_resp_t *resp, void *ctx);
 
+/**
+ * @brief  Https header callback
+ *
+ * @param[in]  key  Header key
+ * @param[in]  key  Header value
+ * @param[in]  ctx  User context
+ */
+typedef void (*http_header_t)(const char *key, const char *value, void *ctx);
+
 /**
  * @brief  Send https requests
  *
  * @note  This API is run in synchronized until response or error returns
  *
- * @param[in]  method   HTTP method to do
- * @param[in]  headers  HTTP headers, headers are array of "Type: Info", last one need set to NULL
- * @param[in]  url      HTTPS URL
- * @param[in]  data     Content data to be sent
- * @param[in]  body     Body callback
- * @param[in]  ctx      User context
+ * @param[in]  method     HTTP method to do
+ * @param[in]  headers    HTTP headers, headers are array of "Type: Info", last one need set to NULL
+ * @param[in]  url        HTTPS URL
+ * @param[in]  data       Content data to be sent
+ * @param[in]  header_cb  Header callback
+ * @param[in]  body       Body callback
+ * @param[in]  ctx        User context
  *
  * @return
  *       - 0       On success
  *       - Others  Fail to do https request
  */
-int https_send_request(const char *method, char **headers, const char *url, char *data, http_body_t body, void *ctx);
+int https_send_request(const char *method, char **headers, const char *url, char *data, http_header_t header_cb, http_body_t body_cb, void *ctx);
 
 /**
  * @brief  Do post https request
  *
  * @note  This API will internally call `https_send_request`
  *
- * @param[in]  url      HTTPS URL to post
- * @param[in]  headers  HTTP headers, headers are array of "Type: Info", last one need set to NULL
- * @param[in]  data     Content data to be sent
- * @param[in]  body     Body callback
- * @param[in]  ctx      User context
+ * @param[in]  url        HTTPS URL to post
+ * @param[in]  headers    HTTP headers, headers are array of "Type: Info", last one need set to NULL
+ * @param[in]  data       Content data to be sent
+ * @param[in]  header_cb  Header callback
+ * @param[in]  body       Body callback
+ * @param[in]  ctx        User context
  *
  * @return
  *       - 0       On success
  *       - Others  Fail to do https request
  */
-int https_post(const char *url, char **headers, char *data, http_body_t body, void *ctx);
+int https_post(const char *url, char **headers, char *data, http_header_t header_cb, http_body_t body, void *ctx);
 
 #ifdef __cplusplus
 }

components/esp_webrtc/impl/apprtc_signal/signal_default.c

@@ -496,7 +496,7 @@ static void reload_ice_task(void *arg)
         media_lib_thread_sleep(50);
         uint32_t cur = time(NULL);
         if (cur > start + sg->ice_expire_time) {
-            int ret = https_post(sg->client_info.ice_server, NULL, NULL, credential_body, &sg->ice_info);
+            int ret = https_post(sg->client_info.ice_server, NULL, NULL, NULL, credential_body, &sg->ice_info);
             if (ret != 0) {
                 break;
             }
@@ -546,7 +546,7 @@ static int wss_signal_start(esp_peer_signaling_cfg_t *cfg, esp_peer_signaling_ha
     }
     int ret = 0;
     // Http post to get client info firstly
-    https_post(cfg->signal_url, NULL, NULL, get_client_info, &sg->client_info);
+    https_post(cfg->signal_url, NULL, NULL, NULL, get_client_info, &sg->client_info);
     if (sg->client_info.client_id == NULL) {
         ESP_LOGE(TAG, "Fail to get client id for room %s", cfg->signal_url);
         ret = -1;
@@ -562,7 +562,7 @@ static int wss_signal_start(esp_peer_signaling_cfg_t *cfg, esp_peer_signaling_ha
         ret = -1;
         goto __exit;
     }
-    https_post(sg->client_info.ice_server, NULL, NULL, credential_body, &sg->ice_info);
+    https_post(sg->client_info.ice_server, NULL, NULL, NULL, credential_body, &sg->ice_info);
     sg->ice_info.is_initiator = sg->client_info.is_initiator;
     if (sg->ice_info.server_info.psw == NULL) {
         printf("Fail to get password\n");
@@ -646,7 +646,7 @@ static int wss_signal_send_msg(esp_peer_signaling_handle_t h, esp_peer_signaling
     }
     char *payload = cJSON_PrintUnformatted(json);
     cJSON_Delete(json);
-    int ret = https_post(request_room, NULL, payload, NULL, NULL);
+    int ret = https_post(request_room, NULL, payload, NULL, NULL, NULL);
     free(payload);
     return ret;
 }
@@ -660,7 +660,7 @@ static void wss_send_leave(wss_sig_t *sg)
     char header[128];
     char *headers[2] = { header, NULL };
     snprintf(header, 128, "Referer: %s/r/%s", sg->client_info.base_url, sg->client_info.room_id);
-    https_post(request_room, headers, NULL, NULL, NULL);
+    https_post(request_room, headers, NULL, NULL, NULL, NULL);
     esp_peer_signaling_msg_t msg = {
         .type = ESP_PEER_SIGNALING_MSG_BYE,
     };
@@ -669,7 +669,7 @@ static void wss_send_leave(wss_sig_t *sg)
     snprintf(request_room, 128, "%s/%s/%s",
              sg->client_info.wss_post_url,
              sg->client_info.room_id, sg->client_info.client_id);
-    https_send_request("DELETE", NULL, request_room, NULL, NULL, NULL);
+    https_send_request("DELETE", NULL, request_room, NULL, NULL, NULL, NULL);
 }
 
 int wss_signal_stop(esp_peer_signaling_handle_t h)