Restructured sample_config.c/h to app_webrtc.c/h

 - We now handle specific initialization code in app_webrtc.c
 - Added event registration option

Author: vikramdattu

esp_port/examples/app_common/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(srcs "src/app_wifi.c" "src/app_storage.c" "src/sample_config.c" "src/app_media.c")
+set(srcs "src/app_wifi.c" "src/app_storage.c" "src/app_media.c" "src/app_webrtc.c")
 
 set(requires esp_wifi fatfs spiffs media_stream)
 

esp_port/examples/app_common/idf_component.yml

@@ -15,6 +15,10 @@ dependencies:
     path: ../../components/credential
     version: "*"
 
+  media_stream:
+    path: ../../components/media_stream
+    version: "*"
+
   webrtc_bridge:
     path: ../../components/webrtc_bridge
     version: "*"

esp_port/examples/app_common/include/sample_config.h renamed to esp_port/examples/app_common/include/app_webrtc.h

@@ -56,6 +56,38 @@ extern "C" {
 #define MASTER_DATA_CHANNEL_MESSAGE "This message is from the KVS Master"
 #define VIEWER_DATA_CHANNEL_MESSAGE "This message is from the KVS Viewer"
 
+typedef enum {
+    // Initialization / Deinitialization
+    APP_WEBRTC_EVENT_INITIALIZED,
+    APP_WEBRTC_EVENT_DEINITIALIZING,
+
+    // Signaling Client States
+    APP_WEBRTC_EVENT_SIGNALING_CONNECTING,
+    APP_WEBRTC_EVENT_SIGNALING_CONNECTED,
+    APP_WEBRTC_EVENT_SIGNALING_DISCONNECTED,
+    APP_WEBRTC_EVENT_SIGNALING_DESCRIBE,
+    APP_WEBRTC_EVENT_SIGNALING_GET_ENDPOINT,
+    APP_WEBRTC_EVENT_SIGNALING_GET_ICE,
+    APP_WEBRTC_EVENT_PEER_CONNECTION_REQUESTED,
+    APP_WEBRTC_EVENT_PEER_CONNECTED,
+    APP_WEBRTC_EVENT_PEER_DISCONNECTED,
+    APP_WEBRTC_EVENT_STREAMING_STARTED,        // When media threads actually start for a peer
+    APP_WEBRTC_EVENT_STREAMING_STOPPED,        // When media threads stop for a peer
+    APP_WEBRTC_EVENT_RECEIVED_OFFER,
+    APP_WEBRTC_EVENT_SENT_ANSWER,
+    APP_WEBRTC_EVENT_RECEIVED_ICE_CANDIDATE,
+    APP_WEBRTC_EVENT_SENT_ICE_CANDIDATE,
+    APP_WEBRTC_EVENT_ICE_GATHERING_COMPLETE,
+
+    // Peer Connection States
+    APP_WEBRTC_EVENT_PEER_CONNECTING,          // Peer connection attempt started
+    APP_WEBRTC_EVENT_PEER_CONNECTION_FAILED,   // Specific connection failure
+
+    // Error Events
+    APP_WEBRTC_EVENT_ERROR,
+    APP_WEBRTC_EVENT_SIGNALING_ERROR,
+} app_webrtc_event_t;
+
 /**
  * @brief Structure to hold AWS credentials and related options
  */
@@ -315,6 +347,112 @@ STATUS initSignaling(PSampleConfiguration, PCHAR);
 BOOL sampleFilterNetworkInterfaces(UINT64, PCHAR);
 UINT32 setLogLevel();
 
+// Event data structure to pass to callbacks
+typedef struct {
+    app_webrtc_event_t event_id;
+    UINT32 status_code;
+    CHAR peer_id[MAX_SIGNALING_CLIENT_ID_LEN + 1];
+    CHAR message[256];
+} app_webrtc_event_data_t;
+
+// Event callback type
+typedef void (*app_webrtc_event_callback_t) (app_webrtc_event_data_t *event_data, void *user_ctx);
+
+/**
+ * @brief Register a callback for WebRTC events
+ *
+ * @param callback Function to call when events occur
+ * @param user_ctx User context pointer passed to the callback
+ *
+ * @return 0 on success, non-zero on failure
+ */
+INT32 app_webrtc_register_event_callback(app_webrtc_event_callback_t callback, void *user_ctx);
+
+typedef enum {
+    APP_WEBRTC_CLASSIC_MODE, // Default: both signaling and streaming
+    APP_WEBRTC_SIGNALING_ONLY_MODE,
+    APP_WEBRTC_STREAMING_ONLY_MODE,
+} app_webrtc_mode_t;
+
+/**
+ * @brief WebRTC application configuration structure
+ */
+typedef struct {
+    // Channel configuration
+    PCHAR pChannelName;                      // Name of the signaling channel
+    SIGNALING_CHANNEL_ROLE_TYPE roleType;    // Role type (master or viewer)
+
+    // AWS credentials configuration
+    BOOL useIotCredentials;                  // Whether to use IoT Core credentials
+    PCHAR iotCoreCredentialEndpoint;         // IoT Core credential endpoint
+    PCHAR iotCoreCert;                       // Path to IoT Core certificate
+    PCHAR iotCorePrivateKey;                 // Path to IoT Core private key
+    PCHAR iotCoreRoleAlias;                  // IoT Core role alias
+    PCHAR iotCoreThingName;                  // IoT Core thing name
+
+    // Direct AWS credentials (if not using IoT credentials)
+    PCHAR awsAccessKey;                      // AWS access key
+    PCHAR awsSecretKey;                      // AWS secret key
+    PCHAR awsSessionToken;                   // AWS session token
+
+    // Common AWS options
+    PCHAR awsRegion;                         // AWS region
+    PCHAR caCertPath;                        // Path to CA certificates
+
+    // WebRTC configuration
+    BOOL trickleIce;                         // Whether to use trickle ICE
+    BOOL useTurn;                            // Whether to use TURN servers
+    UINT32 logLevel;                         // Log level
+
+    // Media configuration
+    RTC_CODEC audioCodec;                    // Audio codec to use
+    RTC_CODEC videoCodec;                    // Video codec to use
+    SampleStreamingMediaType mediaType;      // Media type (audio-only, video-only, or both)
+    app_webrtc_mode_t mode;                  // Mode of the application
+
+    // Callbacks
+    startRoutine audioSourceCallback;        // Callback for audio source
+    startRoutine videoSourceCallback;        // Callback for video source
+    startRoutine receiveAudioVideoCallback;  // Callback for receiving audio/video
+} WebRtcAppConfig, *PWebRtcAppConfig;
+
+/**
+ * @brief Initialize WebRTC application with the given configuration
+ *
+ * This function creates and initializes the WebRTC configuration, sets up
+ * the signaling client, and prepares the WebRTC stack for streaming.
+ *
+ * @param[in] pConfig Configuration for the WebRTC application
+ *
+ * @return STATUS code of the execution
+ */
+STATUS webrtcAppInit(PWebRtcAppConfig pConfig);
+
+/**
+ * @brief Run the WebRTC application and wait for termination
+ *
+ * This function starts the WebRTC streaming session and waits until it's terminated.
+ *
+ * @return STATUS code of the execution
+ */
+STATUS webrtcAppRun(VOID);
+
+/**
+ * @brief Terminate the WebRTC application
+ *
+ * This function cleans up resources and terminates the WebRTC application.
+ *
+ * @return STATUS code of the execution
+ */
+STATUS webrtcAppTerminate(VOID);
+
+/**
+ * @brief Get the sample configuration
+ *
+ * @return STATUS code of the execution
+ */
+STATUS webrtcAppGetSampleConfiguration(PSampleConfiguration *ppSampleConfiguration);
+
 #ifdef __cplusplus
 }
 #endif

esp_port/examples/app_common/src/app_media.c

@@ -9,7 +9,7 @@
 #include "esp_log.h"
 #include "esp_timer.h"
 #include "app_media.h"
-#include "sample_config.h"
+#include "app_webrtc.h"
 
 static const char *TAG = "app_media";