Changeset 3652

Timestamp:

Jul 15, 2011 6:18:29 AM (13 years ago)

Author:

bennylp

Message:

Re #1265 (GUI events): initial implementation, for renderer only first. Also re #1320 (misc): moved function prototypes from pjsua_xx.c to pjsua_internal.h

Location:

pjproject/branches/projects/2.0-dev

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (2 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua_internal.h (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (2 diffs)

pjproject/branches/projects/2.0-dev/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3143 +3143 @@
 }
 
+/* Callback on media events */
+static void on_call_media_event(pjsua_call_id call_id,
+                                unsigned med_idx,
+                                pjmedia_event *event)
+{
+    char event_name[5];
+    PJ_LOG(4,(THIS_FILE, "Event %s",
+              pjmedia_fourcc_name(event->type, event_name)));
+}
+
 /*
  * Print buddy list.
@@ -5101 +5111 @@
     app_config.cfg.cb.on_ice_transport_error = &on_ice_transport_error;
     app_config.cfg.cb.on_snd_dev_operation = &on_snd_dev_operation;
+    app_config.cfg.cb.on_call_media_event = &on_call_media_event;
     app_config.log_cfg.cb = log_cb;
 

pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua.h

@@ -1046 +1046 @@
     pj_status_t (*on_snd_dev_operation)(int operation);
 
+    /**
+     * Notification about media events such as video notifications. This
+     * callback will most likely be called from media threads, thus
+     * application must not perform heavy processing in this callback.
+     * Especially, application must not destroy the call or media in this
+     * callback. If application needs to perform more complex tasks to
+     * handle the event, it should post the task to another thread.
+     *
+     * @param call_id   The call id.
+     * @param med_idx   The media stream index.
+     * @param event     The media event.
+     */
+    void (*on_call_media_event)(pjsua_call_id call_id,
+                                unsigned med_idx,
+                                pjmedia_event *event);
 
 } pjsua_callback;

pjproject/branches/projects/2.0-dev/pjsip/include/pjsua-lib/pjsua_internal.h

@@ -99 +99 @@
                                             address)                        */
     pjmedia_srtp_use     rem_srtp_use; /**< Remote's SRTP usage policy.     */
+
+    pjmedia_event_subscription esub;/**< To subscribe to media events.      */
 } pjsua_call_media;
 
@@ -514 +516 @@
 pj_status_t pjsua_media_channel_deinit(pjsua_call_id call_id);
 
+pj_status_t pjsua_call_media_init(pjsua_call_media *call_med,
+                                  pjmedia_type type,
+                                  const pjsua_transport_config *tcfg,
+                                  int security_level,
+                                  int *sip_err_code);
+pj_status_t video_channel_update(pjsua_call_media *call_med,
+                                 pj_pool_t *tmp_pool,
+                                 const pjmedia_sdp_session *local_sdp,
+                                 const pjmedia_sdp_session *remote_sdp);
+
 
 /**

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1313 +1313 @@
 }
 
+/* Callback to receive media events */
+static pj_status_t call_media_on_event(pjmedia_event_subscription *esub,
+                                       pjmedia_event *event)
+{
+    pjsua_call_media *call_med = (pjsua_call_media*)esub->user_data;
+    pjsua_call *call = call_med->call;
+
+    if (pjsua_var.ua_cfg.cb.on_call_media_event && call) {
+        ++event->proc_cnt;
+        (*pjsua_var.ua_cfg.cb.on_call_media_event)(call->index,
+                                                   call_med->idx, event);
+    }
+
+    return PJ_SUCCESS;
+}
+
 /* Initialize the media line */
 pj_status_t pjsua_call_media_init(pjsua_call_media *call_med,
@@ -1410 +1426 @@
     PJ_UNUSED_ARG(security_level);
 #endif
+
+    pjmedia_event_subscription_init(&call_med->esub, &call_media_on_event,
+                                    call_med);
 
     return PJ_SUCCESS;
@@ -2170 +2189 @@
 }
 
-
-pj_status_t video_channel_update(pjsua_call_media *call_med,
-                                 pj_pool_t *tmp_pool,
-                                 const pjmedia_sdp_session *local_sdp,
-                                 const pjmedia_sdp_session *remote_sdp);
-
 pj_status_t pjsua_media_channel_update(pjsua_call_id call_id,
                                        const pjmedia_sdp_session *local_sdp,

pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -631 +631 @@
             if (status != PJ_SUCCESS)
                 return status;
+
+            /* Register to video events */
+            pjmedia_event_subscribe(
+                    pjmedia_vid_port_get_event_publisher(w->vp_rend),
+                    &call_med->esub);
 
             w = &pjsua_var.win[wid];
@@ -1122 +1127 @@
 }
 
-
-pj_status_t pjsua_call_media_init(pjsua_call_media *call_med,
-                                  pjmedia_type type,
-                                  const pjsua_transport_config *tcfg,
-                                  int security_level,
-                                  int *sip_err_code);
-
-
 /* Add a new video stream into a call */
 static pj_status_t call_add_video(pjsua_call *call,