Changeset 3617 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_port.c

Timestamp:

Jul 12, 2011 3:05:35 AM (13 years ago)

Author:

bennylp

Message:

Initial implementation of re #1284 (Event Framework). Current event has been converted to the new framework. Next to convert is codec event

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_port.c (modified) (10 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_port.c

@@ -21 +21 @@
 #include <pjmedia/converter.h>
 #include <pjmedia/errno.h>
+#include <pjmedia/event.h>
 #include <pjmedia/vid_codec.h>
 #include <pj/log.h>
@@ -56 +57 @@
     pjmedia_conversion_param conv_param;
 
+    pjmedia_event_publisher  epub;
+    pjmedia_event_subscription esub_dev;
+
     pjmedia_clock           *clock;
-
     pjmedia_clock_src        clocksrc;
 
@@ -86 +89 @@
                                        void *user_data,
                                        pjmedia_frame *frame);
-static pj_status_t vidstream_event_cb(pjmedia_vid_dev_stream *stream,
-                                      void *user_data,
-                                      pjmedia_vid_event *event);
+static pj_status_t vidstream_event_cb(pjmedia_event_subscription *esub,
+                                      pjmedia_event *event);
 
 static void enc_clock_cb(const pj_timestamp *ts, void *user_data);
@@ -152 +154 @@
     vp->dir = prm->vidparam.dir;
 //    vp->cap_size = vfd->size;
+    pjmedia_event_publisher_init(&vp->epub);
 
     vparam = prm->vidparam;
@@ -203 +206 @@
     vid_cb.capture_cb = &vidstream_cap_cb;
     vid_cb.render_cb = &vidstream_render_cb;
-    vid_cb.on_event_cb = &vidstream_event_cb;
 
     status = pjmedia_vid_dev_stream_create(&vparam, &vid_cb, vp,
@@ -216 +218 @@
               vparam.fmt.det.vid.size.w, vparam.fmt.det.vid.size.h,
               vparam.fmt.det.vid.fps.num, vparam.fmt.det.vid.fps.denum));
+
+    /* Subscribe to device's events */
+    pjmedia_event_subscription_init(&vp->esub_dev, vidstream_event_cb, vp);
+    pjmedia_event_subscribe(
+            pjmedia_vid_dev_stream_get_event_publisher(vp->strm),
+            &vp->esub_dev);
 
     if (vp->dir & PJMEDIA_DIR_CAPTURE) {
@@ -339 +347 @@
 }
 
+PJ_DEF(pjmedia_event_publisher*)
+pjmedia_vid_port_get_event_publisher(pjmedia_vid_port *vid_port)
+{
+    PJ_ASSERT_RETURN(vid_port, NULL);
+    return &vid_port->epub;
+}
+
 PJ_DEF(pjmedia_vid_dev_stream*)
 pjmedia_vid_port_get_stream(pjmedia_vid_port *vp)
@@ -498 +513 @@
 */
 
-static pj_status_t vidstream_event_cb(pjmedia_vid_dev_stream *stream,
-                                      void *user_data,
-                                      pjmedia_vid_event *event)
-{
-    pjmedia_vid_port *vp = (pjmedia_vid_port*)user_data;
+static pj_status_t vidstream_event_cb(pjmedia_event_subscription *esub,
+                                      pjmedia_event *event)
+{
+    pjmedia_vid_port *vp = (pjmedia_vid_port*)esub->user_data;
     
-    if (vp->strm_cb.on_event_cb)
-        return (*vp->strm_cb.on_event_cb)(stream, vp->strm_cb_data, event);
-    return PJ_SUCCESS;
+    /* Just republish the event to our client */
+    return pjmedia_event_publish(&vp->epub, event);
 }
 
@@ -530 +543 @@
     if (frame->bit_info & PJMEDIA_VID_CODEC_EVENT_FMT_CHANGED) {
         const pjmedia_video_format_detail *vfd;
-        pjmedia_vid_event pevent;
+        pjmedia_event pevent;
         pj_status_t status;
 
@@ -593 +606 @@
 
         /* Notify application of the format change. */
-        pevent.event_type = PJMEDIA_EVENT_FMT_CHANGED;
-        pjmedia_format_copy(&pevent.event_desc.fmt_change.new_format,
+        pjmedia_event_init(&pevent, PJMEDIA_EVENT_FMT_CHANGED, NULL, &vp->epub);
+        pjmedia_format_copy(&pevent.data.fmt_changed.new_fmt,
                             &vp->client_port->info.fmt);
-        if (vp->strm_cb.on_event_cb)
-            (*vp->strm_cb.on_event_cb)(vp->strm, vp->strm_cb_data, &pevent);
+        pjmedia_event_publish(&vp->epub, &pevent);
 
         pjmedia_vid_port_start(vp);