Changeset 3992 for pjproject/trunk

Timestamp:

Mar 29, 2012 8:22:35 AM (13 years ago)

Author:

ming

Message:

Fixed #1472: Modify video port to create its own clock instead of using the device's clock

File:

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

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

@@ -283 +283 @@
         goto on_error;
 
-    if (vp->role==ROLE_ACTIVE && vp->stream_role==ROLE_PASSIVE) {
+    if (vp->role==ROLE_ACTIVE &&
+        ((vp->dir & PJMEDIA_DIR_ENCODING) || vp->stream_role==ROLE_PASSIVE))
+    {
         pjmedia_clock_param param;
 
         /* Active role is wanted, but our device is passive, so create
-         * master clocks to run the media flow.
+         * master clocks to run the media flow. For encoding direction,
+         * we also want to create our own clock since the device's clock
+         * may run at a different rate.
          */
         need_frame_buf = PJ_TRUE;
@@ -669 +673 @@
      */
     pjmedia_vid_port *vp = (pjmedia_vid_port*)user_data;
+    pjmedia_frame frame_;
     pj_status_t status;
 
@@ -685 +690 @@
     //save_rgb_frame(vp->cap_size.w, vp->cap_size.h, vp->frm_buf);
 
-    vidstream_cap_cb(vp->strm, vp, vp->frm_buf);
+    status = convert_frame(vp, vp->frm_buf, &frame_);
+    if (status != PJ_SUCCESS)
+        return;
+
+    status = pjmedia_port_put_frame(vp->client_port, 
+                                    (vp->conv? &frame_: vp->frm_buf));
+    if (status != PJ_SUCCESS)
+        return;
 }
 
@@ -718 +730 @@
     pjmedia_vid_port *vp = (pjmedia_vid_port*)user_data;
 
-    if (vp->role==ROLE_ACTIVE) {
-        pj_status_t status;
-        pjmedia_frame frame_;
-        
-        status = convert_frame(vp, frame, &frame_);
-        if (status != PJ_SUCCESS)
-            return status;
-
-        if (vp->client_port)
-            status = pjmedia_port_put_frame(vp->client_port, 
-                                            (vp->conv? &frame_: frame));
-        if (status != PJ_SUCCESS)
-            return status;
-    } else {
-        /* We are passive while the stream is active so we just store the
-         * frame in the buffer.
-         * The decoding counterpart is located in vid_pasv_port_put_frame()
-         */
-        copy_frame_to_buffer(vp, frame);
-    }
+    /* We just store the frame in the buffer. For active role, we let
+     * video port's clock to push the frame buffer to the user.
+     * The decoding counterpart for passive role and active stream is
+     * located in vid_pasv_port_put_frame()
+     */
+    copy_frame_to_buffer(vp, frame);
+
     /* This is tricky since the frame is still in its original unconverted
      * format, which may not be what the application expects.