Changeset 5939 for pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

Timestamp:

Mar 5, 2019 6:23:02 AM (5 years ago)

Author:

nanang

Message:

Re #2181: Initial version of video conference implementation.

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_port.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -647 +647 @@
         vp->pasv_port = pp = PJ_POOL_ZALLOC_T(pool, vid_pasv_port);
         pp->vp = vp;
-        pp->base.get_frame = &vid_pasv_port_get_frame;
-        pp->base.put_frame = &vid_pasv_port_put_frame;
+        if (prm->vidparam.dir & PJMEDIA_DIR_CAPTURE)
+            pp->base.get_frame = &vid_pasv_port_get_frame;
+        if (prm->vidparam.dir & PJMEDIA_DIR_RENDER)
+            pp->base.put_frame = &vid_pasv_port_put_frame;
         pjmedia_port_info_init2(&pp->base.info, &vp->dev_name,
                                 PJMEDIA_SIG_VID_PORT,
@@ -730 +732 @@
 }
 
+
+PJ_DEF(pj_status_t) pjmedia_vid_port_subscribe_event(
+                                                pjmedia_vid_port *vp,
+                                                pjmedia_port *port)
+{
+    PJ_ASSERT_RETURN(vp && port, PJ_EINVAL);
+
+    /* Subscribe to port's events */
+    return pjmedia_event_subscribe(NULL, &client_port_event_cb, vp, port);
+}
 
 PJ_DEF(pj_status_t) pjmedia_vid_port_connect(pjmedia_vid_port *vp,
@@ -1001 +1013 @@
         }
         
-        if (vp->stream_role == ROLE_PASSIVE) {
+        if (vp->role == ROLE_ACTIVE && vp->stream_role == ROLE_PASSIVE) {
             pjmedia_clock_param clock_param;
             
@@ -1017 +1029 @@
         /* pjmedia_vid_port_start(vp); */
         pjmedia_vid_dev_stream_start(vp->strm);
+
+        /* Update passive port info from the video stream */
+        if (vp->role == ROLE_PASSIVE) {
+            pjmedia_format_copy(&vp->pasv_port->base.info.fmt,
+                                &event->data.fmt_changed.new_fmt);
+        }
     }