Added WebRTC split functionality

 - Added streaming_only and signaling_only examples
 - streaming_only can be flashed on P4 and signaling only on C6
 - The message exchange between the two happens over webrtc_bridge

Author: vikramdattu

esp_port/components/esp_webrtc_utils/src/esp_work_queue.c

@@ -13,8 +13,12 @@
 #include <esp_work_queue.h>
 
 #define ESP_WORKQ_SIZE           32
-#define ESP_WORKQ_TASK_STACK     (60 * 1014)
 #define ESP_WORKQ_TASK_PRIO      (8)
+#if ENABLE_SIGNALLING_ONLY
+#define ESP_WORKQ_TASK_STACK     (16 * 1014)
+#else
+#define ESP_WORKQ_TASK_STACK     (24 * 1014)
+#endif
 
 static const char *TAG = "esp_work_queue";
 
@@ -129,19 +133,13 @@ esp_err_t esp_work_queue_start(void)
     }
 
     StaticTask_t *task_buffer = heap_caps_calloc(1, sizeof(StaticTask_t), MALLOC_CAP_INTERNAL);
-    // void *task_stack = heap_caps_calloc_prefer(1, ESP_WORKQ_TASK_STACK, MALLOC_CAP_SPIRAM, MALLOC_CAP_INTERNAL);
-    void *task_stack = heap_caps_malloc(ESP_WORKQ_TASK_STACK, MALLOC_CAP_INTERNAL);
+    void *task_stack = heap_caps_malloc_prefer(ESP_WORKQ_TASK_STACK, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT, MALLOC_CAP_INTERNAL);
     assert(task_buffer && task_stack);
 
     /* the task never exits, so do not bother to free the buffers */
     xTaskCreateStatic(&esp_work_queue_task, "esp_workq_task", ESP_WORKQ_TASK_STACK,
                       NULL, ESP_WORKQ_TASK_PRIO, task_stack, task_buffer);
 
-    // if (xTaskCreate(&esp_work_queue_task, "rmaker_queue_task", ESP_WORKQ_TASK_STACK,
-    //             NULL, ESP_WORKQ_TASK_PRIO, NULL) != pdPASS) {
-    //     ESP_LOGE(TAG, "Couldn't create RainMaker work queue task");
-    //     return ESP_FAIL;
-    // }
     queue_state = WORK_QUEUE_STATE_RUNNING;
     return ESP_OK;
 }

esp_port/components/esp_webrtc_utils/src/flash_wrapper.c

@@ -141,7 +141,7 @@ esp_err_t flash_wrapper_init(void)
     BaseType_t res = xTaskCreate(
         flash_op_task,
         "flash_op_task",
-        8192,
+        4096,
         NULL,
         5,
         &flash_task_handle

esp_port/components/kvs_webrtc/CMakeLists.txt

@@ -102,12 +102,12 @@ if(CONFIG_USE_ESP_WEBSOCKET_CLIENT)
     target_compile_definitions(${COMPONENT_LIB} PUBLIC -DUSE_ESP_WEBSOCKET -DESP_PLATFORM)
 endif()
 
-option(ENABLE_KVS_THREADPOOL "Enable support for KVS thread pool in signaling" ON)
+# option(ENABLE_KVS_THREADPOOL "Enable support for KVS thread pool in signaling" OFF)
 set(KVS_PLAT_ESP_FREERTOS ON CACHE BOOL "Build for ESP FreeRTOS")
 add_definitions(-DKVS_PLAT_ESP_FREERTOS)
-if (ENABLE_KVS_THREADPOOL)
-  add_definitions(-DENABLE_KVS_THREADPOOL)
-endif()
+# if (ENABLE_KVS_THREADPOOL)
+#   add_definitions(-DENABLE_KVS_THREADPOOL)
+# endif()
 
 # Check for ifaddrs.h and poll.h
 include(CheckIncludeFiles)

esp_port/components/webrtc_bridge/idf_component.yml

@@ -5,6 +5,15 @@ dependencies:
   esp_webrtc_utils:
     path: ../esp_webrtc_utils
     version: "*"
-  # espressif/esp_hosted:
-  #   override_path: ../esp_hosted
-  #   version: "*"
+
+  espressif/esp_hosted:
+    override_path: ../esp_hosted
+    version: "*"
+    rules:
+      - if: "target not in [linux]"
+
+  network_coprocessor:
+    path: ../network_coprocessor
+    version: "*"
+    rules:
+      - if: target in [esp32c6, esp32c5]

esp_port/components/webrtc_bridge/src/webrtc_bridge.c

@@ -277,24 +277,16 @@ void webrtc_bridge_send_message(const char *data, int len)
 #ifndef CONFIG_ESP_WEBRTC_BRIDGE_HOSTED
 static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_t event_id, void *event_data)
 {
-    ESP_LOGD(TAG, "Event dispatched from event loop base=%s, event_id=%" PRIi32 "", base, event_id);
     esp_mqtt_event_handle_t event = event_data;
     esp_mqtt_client_handle_t client = event->client;
     int msg_id;
-
-    switch ((esp_mqtt_event_id_t)event_id) {
+    // your_context_t *context = event->context;
+    switch (event->event_id) {
     case MQTT_EVENT_CONNECTED:
+        ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED");
         msg_id = esp_mqtt_client_subscribe(client, FROM_TOPIC, 0);
         ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
 
-
-        ESP_LOGI(TAG, "MQTT_EVENT_CONNECTED");
-        // msg_id = esp_mqtt_client_publish(client, "/topic/qos1", "data_3", 0, 1, 0);
-        // ESP_LOGI(TAG, "sent publish successful, msg_id=%d", msg_id);
-
-        // msg_id = esp_mqtt_client_subscribe(client, "/topic/qos0", 0);
-        // ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
-
         // msg_id = esp_mqtt_client_subscribe(client, "/topic/qos1", 1);
         // ESP_LOGI(TAG, "sent subscribe successful, msg_id=%d", msg_id);
 
@@ -320,7 +312,11 @@ static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_
         ESP_LOGI(TAG, "MQTT_EVENT_DATA");
         printf("TOPIC=%.*s\r\n", event->topic_len, event->topic);
         printf("DATA=%.*s\r\n", event->data_len, event->data);
-        on_webrtc_bridge_msg_received(event->data, event->data_len);
+        if (message_handler) {
+            message_handler(event->data, event->data_len);
+        } else {
+            on_webrtc_bridge_msg_received((void *) event->data, event->data_len);
+        }
         break;
     case MQTT_EVENT_ERROR:
         ESP_LOGI(TAG, "MQTT_EVENT_ERROR");

esp_port/examples/app_common/CMakeLists.txt

@@ -20,6 +20,10 @@ if (ENABLE_RAINMAKER)
     add_definitions(-DENABLE_RAINMAKER)
 endif ()
 
+if (ENABLE_DATA_CHANNEL)
+    add_definitions(-DENABLE_DATA_CHANNEL)
+endif()
+
 # Create a SPIFFS image from the contents of the 'spiffs_image' directory
 # that fits the partition named 'storage'. FLASH_IN_PROJECT indicates that
 # the generated image should be flashed when the entire project is flashed to

esp_port/examples/app_common/idf_component.yml

@@ -11,10 +11,14 @@ dependencies:
     version: "*"
     public: true
 
-  # espressif/esp_hosted:
-  #   override_path: ../../components/esp_hosted
-  #   version: "*"
+  credential:
+    path: ../../components/credential
+    version: "*"
 
   webrtc_bridge:
     path: ../../components/webrtc_bridge
     version: "*"
+
+  signaling_serializer:
+    path: ../../components/signaling_serializer
+    version: "*"

esp_port/examples/app_common/include/sample_config.h

@@ -21,7 +21,7 @@ extern "C" {
 #define DEFAULT_AUDIO_OPUS_CHANNELS              2
 #define DEFAULT_AUDIO_OPUS_SAMPLE_RATE_HZ        48000
 #define DEFAULT_AUDIO_OPUS_BITS_PER_SAMPLE       16
-#define DEFAULT_MAX_CONCURRENT_STREAMING_SESSION 10
+#define DEFAULT_MAX_CONCURRENT_STREAMING_SESSION 2
 
 #define AUDIO_CODEC_NAME_ALAW  "alaw"
 #define AUDIO_CODEC_NAME_MULAW "mulaw"
@@ -167,6 +167,10 @@ typedef struct {
     RtcOnDataChannel onDataChannel;
     SignalingClientMetrics signalingClientMetrics;
 
+    // Callbacks for signaling messages
+    VOID (*onAnswer)(UINT64, PSignalingMessage);
+    VOID (*onIceCandidate)(UINT64, PSignalingMessage);
+
     PStackQueue pPendingSignalingMessageForRemoteClient;
     PHashTable pRtcPeerConnectionForRemoteClient;
 
@@ -272,7 +276,6 @@ STATUS createSampleConfiguration(PCHAR, SIGNALING_CHANNEL_ROLE_TYPE, BOOL, BOOL,
 STATUS freeSampleConfiguration(PSampleConfiguration*);
 STATUS signalingClientStateChanged(UINT64, SIGNALING_CLIENT_STATE);
 STATUS signalingMessageReceived(UINT64, PReceivedSignalingMessage);
-STATUS handleAnswer(PSampleConfiguration, PSampleStreamingSession, PSignalingMessage);
 STATUS handleOffer(PSampleConfiguration, PSampleStreamingSession, PSignalingMessage);
 STATUS handleRemoteCandidate(PSampleStreamingSession, PSignalingMessage);
 STATUS initializePeerConnection(PSampleConfiguration, PRtcPeerConnection*);
@@ -283,6 +286,28 @@ STATUS streamingSessionOnShutdown(PSampleStreamingSession, UINT64, StreamSession
 STATUS sendSignalingMessage(PSampleStreamingSession, PSignalingMessage);
 STATUS respondWithAnswer(PSampleStreamingSession);
 STATUS resetSampleConfigurationState(PSampleConfiguration);
+
+#ifdef DYNAMIC_SIGNALING_PAYLOAD
+/**
+ * @brief Allocate memory for the payload of a SignalingMessage
+ *
+ * @param[in,out] pSignalingMessage The signaling message for which to allocate payload
+ * @param[in] size Size in bytes to allocate
+ *
+ * @return STATUS code of the execution
+ */
+STATUS allocateSignalingMessagePayload(PSignalingMessage pSignalingMessage, UINT32 size);
+
+/**
+ * @brief Free the dynamically allocated payload of a SignalingMessage
+ *
+ * @param[in,out] pSignalingMessage The signaling message whose payload should be freed
+ *
+ * @return STATUS code of the execution
+ */
+STATUS freeSignalingMessagePayload(PSignalingMessage pSignalingMessage);
+#endif
+
 VOID sampleVideoFrameHandler(UINT64, PFrame);
 VOID sampleAudioFrameHandler(UINT64, PFrame);
 VOID sampleFrameHandler(UINT64, PFrame);
@@ -306,4 +331,4 @@ UINT32 setLogLevel();
 #ifdef __cplusplus
 }
 #endif
-#endif /* __KINESIS_VIDEO_SAMPLE_INCLUDE__ */
+#endif  /* __KINESIS_VIDEO_SAMPLE_INCLUDE__ */