Merge branch 'feature/add_multi_data_ch_support' into 'main'

Add multiple data channel support

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

Author: TempoTian

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

@@ -39,6 +39,7 @@
 
 #define TAG "V4L2_SRC"
 
+#define MAX_BUFS                (4)
 #define MAX_SUPPORT_FORMATS_NUM (4)
 #define FMT_STR(fmt)            ((uint8_t *)&fmt)[0], ((uint8_t *)&fmt)[1], ((uint8_t *)&fmt)[2], ((uint8_t *)&fmt)[3]
 
@@ -49,9 +50,9 @@ typedef struct {
     esp_capture_codec_type_t   support_formats[MAX_SUPPORT_FORMATS_NUM];
     uint8_t                    format_count;
     int                        fd;
-    uint8_t                   *fb_buffer[2];
-    struct v4l2_buffer         v4l2_buf[2];
-    bool                       fb_used[2];
+    uint8_t                   *fb_buffer[MAX_BUFS];
+    struct v4l2_buffer         v4l2_buf[MAX_BUFS];
+    bool                       fb_used[MAX_BUFS];
     bool                       nego_ok;
     bool                       started;
 } v4l2_src_t;
@@ -289,10 +290,8 @@ static int v4l2_close(esp_capture_video_src_if_t *src)
         return -1;
     }
     for (int i = 0; i < v4l2->buf_count; i++) {
-        struct v4l2_buffer *buf = &v4l2->v4l2_buf[i];
         if (v4l2->fb_used[i]) {
             v4l2->fb_used[i] = 0;
-            ioctl(v4l2->fd, VIDIOC_QBUF, buf);
         }
     }
     if (v4l2->fd > 0) {
@@ -320,8 +319,7 @@ esp_capture_video_src_if_t *esp_capture_new_video_v4l2_src(esp_capture_video_v4l
     v4l2->base.stop = v4l2_stop;
     v4l2->base.close = v4l2_close;
     strncpy(v4l2->dev_name, cfg->dev_name, sizeof(v4l2->dev_name));
-    // TODO limit to 2
-    v4l2->buf_count = cfg->buf_count > 2 ? 2 : cfg->buf_count;
+    v4l2->buf_count = (cfg->buf_count > MAX_BUFS ? MAX_BUFS : cfg->buf_count);
     return &v4l2->base;
 }
 #endif

components/esp_webrtc/impl/peer_default/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+## v1.1.0
+
+### Features
+
+- Export buffer configuration for RTP and data channel
+- Added support for multiple data channel
+- Added notify for data channel open, close event
+
+### Bug Fixes
+
+- Fixed keep alive check not take effect if peer closed unexpectly
+
+
+## v1.0.0
+
+- Initial version of `peer_default`

components/esp_webrtc/impl/peer_default/idf_component.yml

@@ -1 +1 @@
-version: 0.0.1
+version: 1.1.0

components/esp_webrtc/impl/peer_default/include/esp_peer_default.h

@@ -31,12 +31,54 @@ extern "C" {
 #endif
 
 /**
- * @brief  Peer default configuration
+ * @brief  Peer default data channel configuration
  */
 typedef struct {
-    uint16_t agent_recv_timeout;  /*!< Agent receive timeout setting*/
-} esp_peer_default_cfg_t;
+    uint16_t cache_timeout;    /*!< Data channel frame keep timeout (unit ms) default: 5000ms if set to 0 */
+    uint32_t send_cache_size;  /*!< Cache size for outgoing data channel packets (unit Bytes)
+                                    default: 100kB if set to 0 */
+    uint32_t recv_cache_size;  /*!< Cache size for incoming data channel packets (unit Bytes)
+                                    default: 100kB if set to 0 */
+} esp_peer_default_data_ch_cfg_t;
+
+/**
+ * @brief  Peer default jitter buffer configuration
+ */
+typedef struct {
+    uint16_t cache_timeout;  /*!< Maximum timeout to keep the received RTP packet (unit ms) default: 100ms if set to 0 */
+    uint16_t resend_delay;   /*!< Not resend until resend delay reached (unit ms) default: 20ms if set to 0*/
+    uint32_t cache_size;     /*!< Cache size for incoming data channel frame (unit Bytes)
+                                  For audio jitter buffer default: 100kB if set to 0
+                                  For video jitter buffer default: 400kB if set to 0 */
+} esp_peer_default_jitter_cfg_t;
+
+/**
+ * @brief  Peer default RTP send and receive configuration
+ *
+ * @note  Insufficient RTP resources can disable features like packet retransmission and loss reporting
+ *        Without these features, packet loss may result in audio glitches and mosaic-like video artifacts
+ */
+typedef struct {
+    esp_peer_default_jitter_cfg_t audio_recv_jitter;  /*!< Audio jitter buffer configuration */
+    esp_peer_default_jitter_cfg_t video_recv_jitter;  /*!< Video jitter buffer configuration */
+    uint32_t                      send_pool_size;     /*!< Send pool size for outgoing RTP packets (unit Bytes)
+                                                           default: 400kB if set to 0 */
+    uint32_t                      send_queue_num;     /*!< Maximum queue number to hold outgoing RTP packet metadata info
+                                                           default: 256 */
+    uint16_t                      max_resend_count;   /*!< Maximum resend count for one RTP packet
+                                                           default: 3 times */
+} esp_peer_default_rtp_cfg_t;
 
+/**
+ * @brief  Peer default configuration (optional)
+ */
+typedef struct {
+    uint16_t                       agent_recv_timeout;  /*!< ICE agent receive timeout setting (unit ms)
+                                                             default: 100ms if set to 0 
+                                                             Some STUN/TURN server reply message slow increase this value */
+    esp_peer_default_data_ch_cfg_t data_ch_cfg;         /*!< Configuration of data channel */
+    esp_peer_default_rtp_cfg_t     rtp_cfg;             /*!< Configuration of RTP buffer */
+} esp_peer_default_cfg_t;
 
 #ifdef __cplusplus
 }

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

@@ -34,16 +34,18 @@ extern "C" {
  * @brief  Peer state
  */
 typedef enum {
-    ESP_PEER_STATE_CLOSED              = 0, /*!< Closed */
-    ESP_PEER_STATE_DISCONNECTED        = 1, /*!< Disconnected */
-    ESP_PEER_STATE_NEW_CONNECTION      = 2, /*!< New connection comming */
-    ESP_PEER_STATE_PAIRING             = 3, /*!< Under candidate pairing */
-    ESP_PEER_STATE_PAIRED              = 4, /*!< Candidate pairing success */
-    ESP_PEER_STATE_CONNECTING          = 5, /*!< Building connection with peer */
-    ESP_PEER_STATE_CONNECTED           = 6, /*!< Connected with peer */
-    ESP_PEER_STATE_CONNECT_FAILED      = 7, /*!< Connect failed */
-    ESP_PEER_STATE_DATA_CHANNEL_OPENED = 8, /*!< Data channel is opened */
-    ESP_PEER_STATE_DATA_CHANNEL_CLOSED = 9, /*!< Data channel is closed */
+    ESP_PEER_STATE_CLOSED                    = 0,  /*!< Closed */
+    ESP_PEER_STATE_DISCONNECTED              = 1,  /*!< Disconnected */
+    ESP_PEER_STATE_NEW_CONNECTION            = 2,  /*!< New connection comming */
+    ESP_PEER_STATE_PAIRING                   = 3,  /*!< Under candidate pairing */
+    ESP_PEER_STATE_PAIRED                    = 4,  /*!< Candidate pairing success */
+    ESP_PEER_STATE_CONNECTING                = 5,  /*!< Building connection with peer */
+    ESP_PEER_STATE_CONNECTED                 = 6,  /*!< Connected with peer */
+    ESP_PEER_STATE_CONNECT_FAILED            = 7,  /*!< Connect failed */
+    ESP_PEER_STATE_DATA_CHANNEL_CONNECTED    = 8,  /*!< Data channel is connected */
+    ESP_PEER_STATE_DATA_CHANNEL_OPENED       = 9,  /*!< Data channel is opened */
+    ESP_PEER_STATE_DATA_CHANNEL_CLOSED       = 10, /*!< Data channel is closed */
+    ESP_PEER_STATE_DATA_CHANNEL_DISCONNECTED = 11, /*!< Data channel is disconencted */
 } esp_peer_state_t;
 
 /**
@@ -134,9 +136,10 @@ typedef struct {
  * @brief  Data frame information
  */
 typedef struct {
-    esp_peer_data_channel_type_t type; /*!< Data channel type */
-    uint8_t                     *data; /*!< Pointer to data to be sent through data channel */
-    int                          size; /*!< Data size */
+    esp_peer_data_channel_type_t type;      /*!< Data channel type */
+    uint16_t                     stream_id; /*!< Data channel stream ID */
+    uint8_t                     *data;      /*!< Pointer to data to be sent through data channel */
+    int                          size;      /*!< Data size */
 } esp_peer_data_frame_t;
 
 /**
@@ -157,6 +160,21 @@ typedef struct {
     int                 size; /*!< Message data size */
 } esp_peer_msg_t;
 
+/**
+ * @brief  Peer data channel configuration for create
+ */
+typedef struct {
+    char *label; /*!< Data channel label */
+} esp_peer_data_channel_cfg_t;
+
+/**
+ * @brief  Peer data channel information
+ */
+typedef struct {
+    const char *label;      /*!< Data channel label */
+    uint16_t    stream_id;  /*!< Chunk stream id for this channel */
+} esp_peer_data_channel_info_t;
+
 /**
  * @brief  Peer handle
  */
@@ -174,7 +192,12 @@ typedef struct {
     esp_peer_video_stream_info_t video_info;          /*!< Video stream information */
     esp_peer_media_dir_t         audio_dir;           /*!< Audio transmission direction */
     esp_peer_media_dir_t         video_dir;           /*!< Video transmission direction */
+    bool                         no_auto_reconnect;   /*!< Disable auto reconnect if connected fail */
     bool                         enable_data_channel; /*!< Enable data channel */
+    bool                         manual_ch_create;    /*!< Manual create data channel
+                                                           When SCTP role is client, it will try to send DCEP automatically
+                                                           To disable this behavior can create data channel manually and set this flag
+                                                          */
     void                        *extra_cfg;           /*!< Extra configuration */
     int                          extra_size;          /*!< Extra configuration size */
     void                        *ctx;                 /*!< User context */
@@ -227,13 +250,29 @@ typedef struct {
      */
     int (*on_video_data)(esp_peer_video_frame_t* frame, void* ctx);
 
+    /**
+     * @brief  Peer data channel opened event callback
+     * @param[in]  ch   Data channel information
+     * @param[in]  ctx  User context
+     * @return          Status code indicating success or failure.
+     */
+    int (*on_channel_open)(esp_peer_data_channel_info_t *ch, void *ctx);
+   
     /**
      * @brief  Peer data frame callback
      * @param[in]  frame  Data frame information
      * @param[in]  ctx    User context
      * @return            Status code indicating success or failure.
      */
-    int (*on_data)(esp_peer_data_frame_t* frame, void* ctx);
+    int (*on_data)(esp_peer_data_frame_t *frame, void *ctx);
+
+    /**
+     * @brief  Peer data channel closed event callback
+     * @param[in]  ch   Data channel information
+     * @param[in]  ctx  User context
+     * @return          Status code indicating success or failure.
+     */
+    int (*on_channel_close)(esp_peer_data_channel_info_t *ch, void *ctx);
 } esp_peer_cfg_t;
 
 /**
@@ -296,6 +335,22 @@ typedef struct {
      */
     int (*send_data)(esp_peer_handle_t peer, esp_peer_data_frame_t* frame);
 
+    /**
+     * @brief  Manually create data chanel for peer
+     * @param[in]   peer    Peer handle
+     * @param[in]   ch_cfg  Data channel configuration
+     * @return              Status code indicating success or failure.
+     */
+    int (*create_data_channel)(esp_peer_handle_t peer, esp_peer_data_channel_cfg_t *ch_cfg);
+
+    /**
+     * @brief  Close data chanel for peer
+     * @param[in]   peer   Peer handle
+     * @param[in]   label  Data channel label
+     * @return             Status code indicating success or failure.
+     */
+    int (*close_data_channel)(esp_peer_handle_t peer, const char *label);
+
     /**
      * @brief  Peer main loop
      * @note  Peer connection need handle peer status change, receive stream data in this loop
@@ -338,7 +393,7 @@ typedef struct {
  *       - ESP_PEER_ERR_INVALID_ARG  Invalid argument
  *       - ESP_PEER_ERR_NOT_SUPPORT  Not support
  */
-int esp_peer_open(esp_peer_cfg_t *cfg, const esp_peer_ops_t *ops, esp_peer_handle_t *handle);
+int esp_peer_open(esp_peer_cfg_t *cfg, const esp_peer_ops_t *ops, esp_peer_handle_t *peer);
 
 /**
  * @brief  Create new conenction
@@ -353,22 +408,53 @@ int esp_peer_open(esp_peer_cfg_t *cfg, const esp_peer_ops_t *ops, esp_peer_handl
  *       - ESP_PEER_ERR_INVALID_ARG  Invalid argument
  *       - ESP_PEER_ERR_NOT_SUPPORT  Not support
  */
-int esp_peer_new_connection(esp_peer_handle_t handle);
+int esp_peer_new_connection(esp_peer_handle_t peer);
+
+/**
+ * @brief  Manually create data channel
+ *
+ * @note  It will send DCEP event to peer until data channel created
+ *        
+ * @param[in]  peer    Peer handle
+ * @param[in]  ch_cfg  Configuration for data channel creation
+ *
+ * @return
+ *       - ESP_PEER_ERR_NONE         Open data channel success
+ *       - ESP_PEER_ERR_INVALID_ARG  Invalid argument
+ *       - ESP_PEER_ERR_NOT_SUPPORT  Not support
+ */
+int esp_peer_create_data_channel(esp_peer_handle_t peer, esp_peer_data_channel_cfg_t *ch_cfg);
+
+/**
+ * @brief  Manually close data channel by label
+ *
+ * @param[in]  peer   Peer handle
+ * @param[in]  label  Channel label
+ *
+ * @return
+ *       - ESP_PEER_ERR_NONE         Close data channel success
+ *       - ESP_PEER_ERR_INVALID_ARG  Invalid argument
+ *       - ESP_PEER_ERR_NOT_SUPPORT  Not support
+ */
+int esp_peer_close_data_channel(esp_peer_handle_t peer, const char *label);
 
 /**
  * @brief  Update ICE server information
  *
  * @note  After new connection is created, It will try gather ICE candidate from ICE servers.
  *        And report local SDP to let user send to signaling server.
  *
- * @param[in]  peer  Peer handle
+ * @param[in]  peer        Peer handle
+ * @param[in]  role        Peer roles of controlling or controlled
+ * @param[in]  server      Pointer to array of ICE server configuration
+ * @param[in]  server_num  ICE server number
  *
  * @return
  *       - ESP_PEER_ERR_NONE         Open peer connection success
  *       - ESP_PEER_ERR_INVALID_ARG  Invalid argument
  *       - ESP_PEER_ERR_NOT_SUPPORT  Not support
  */
-int esp_peer_update_ice_info(esp_peer_handle_t handle, esp_peer_role_t role, esp_peer_ice_server_cfg_t* server, int server_num);
+int esp_peer_update_ice_info(esp_peer_handle_t peer, esp_peer_role_t role, esp_peer_ice_server_cfg_t* server, int server_num);
 
 /**
  * @brief  Send message to peer
@@ -453,7 +539,7 @@ int esp_peer_main_loop(esp_peer_handle_t peer);
  *       - ESP_PEER_ERR_INVALID_ARG  Invalid argument
  *       - ESP_PEER_ERR_NOT_SUPPORT  Not support
  */
-int esp_peer_disconnect(esp_peer_handle_t handle);
+int esp_peer_disconnect(esp_peer_handle_t peer);
 
 /**
  * @brief  Query of peer connection
@@ -466,7 +552,7 @@ int esp_peer_disconnect(esp_peer_handle_t handle);
  *       - ESP_PEER_ERR_NONE         Open peer connection success
  *       - ESP_PEER_ERR_INVALID_ARG  Invalid argument
  */
-int esp_peer_query(esp_peer_handle_t handle);
+int esp_peer_query(esp_peer_handle_t peer);
 
 /**
  * @brief  Close peer connection
@@ -480,7 +566,7 @@ int esp_peer_query(esp_peer_handle_t handle);
  *       - ESP_PEER_ERR_INVALID_ARG  Invalid argument
  *       - ESP_PEER_ERR_NOT_SUPPORT  Not support
  */
-int esp_peer_close(esp_peer_handle_t handle);
+int esp_peer_close(esp_peer_handle_t peer);
 
 #ifdef __cplusplus
 }