Changeset 4026 for pjproject/trunk

Timestamp:

Apr 5, 2012 8:38:27 AM (13 years ago)

Author:

ming

Message:

Re #1472: Adjust the clock's get_frame() rate if the video device is passive

File:

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

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

@@ -57 +57 @@
     pj_bool_t                destroy_client_port;
 
-    pjmedia_converter       *conv;
-    void                    *conv_buf;
-    pj_size_t                conv_buf_size;
-    pjmedia_conversion_param conv_param;
+    struct {
+        pjmedia_converter       *conv;
+        void                    *conv_buf;
+        pj_size_t                conv_buf_size;
+        pjmedia_conversion_param conv_param;
+        unsigned                 usec_ctr;
+        unsigned                 usec_src, usec_dst;
+    } conv;
 
     pjmedia_clock           *clock;
@@ -126 +130 @@
 static pj_status_t create_converter(pjmedia_vid_port *vp)
 {
-    if (vp->conv) {
-        pjmedia_converter_destroy(vp->conv);
-        vp->conv = NULL;
+    if (vp->conv.conv) {
+        pjmedia_converter_destroy(vp->conv.conv);
+        vp->conv.conv = NULL;
     }
 
     /* Instantiate converter if necessary */
-    if (vp->conv_param.src.id != vp->conv_param.dst.id ||
-        vp->conv_param.src.det.vid.size.w != vp->conv_param.dst.det.vid.size.w ||
-        vp->conv_param.src.det.vid.size.h != vp->conv_param.dst.det.vid.size.h)
+    if (vp->conv.conv_param.src.id != vp->conv.conv_param.dst.id ||
+        (vp->conv.conv_param.src.det.vid.size.w !=
+         vp->conv.conv_param.dst.det.vid.size.w) ||
+        (vp->conv.conv_param.src.det.vid.size.h !=
+         vp->conv.conv_param.dst.det.vid.size.h))
     {
         pj_status_t status;
 
         /* Yes, we need converter */
-        const pjmedia_video_format_info *vfi;
-        pjmedia_video_apply_fmt_param vafp;
-
-        status = pjmedia_converter_create(NULL, vp->pool, &vp->conv_param,
-                                          &vp->conv);
+        status = pjmedia_converter_create(NULL, vp->pool, &vp->conv.conv_param,
+                                          &vp->conv.conv);
         if (status != PJ_SUCCESS) {
             PJ_PERROR(4,(THIS_FILE, status, "Error creating converter"));
             return status;
         }
+    }
+
+    if (vp->conv.conv ||
+        (vp->role==ROLE_ACTIVE && (vp->dir & PJMEDIA_DIR_ENCODING)))
+    {
+        pj_status_t status;
+        const pjmedia_video_format_info *vfi;
+        pjmedia_video_apply_fmt_param vafp;
 
         /* Allocate buffer for conversion */
-        vfi = pjmedia_get_video_format_info(NULL, vp->conv_param.dst.id);
+        vfi = pjmedia_get_video_format_info(NULL, vp->conv.conv_param.dst.id);
         if (!vfi)
             return PJMEDIA_EBADFMT;
 
         pj_bzero(&vafp, sizeof(vafp));
-        vafp.size = vp->conv_param.dst.det.vid.size;
+        vafp.size = vp->conv.conv_param.dst.det.vid.size;
         status = vfi->apply_fmt(vfi, &vafp);
         if (status != PJ_SUCCESS)
             return PJMEDIA_EBADFMT;
 
-        if (vafp.framebytes > vp->conv_buf_size) {
-            vp->conv_buf = pj_pool_alloc(vp->pool, vafp.framebytes);
-            vp->conv_buf_size = vafp.framebytes;
+        if (vafp.framebytes > vp->conv.conv_buf_size) {
+            vp->conv.conv_buf = pj_pool_alloc(vp->pool, vafp.framebytes);
+            vp->conv.conv_buf_size = vafp.framebytes;
         }
     }
+
+    vp->conv.usec_ctr = 0;
+    vp->conv.usec_src = PJMEDIA_PTIME(&vp->conv.conv_param.src.det.vid.fps);
+    vp->conv.usec_dst = PJMEDIA_PTIME(&vp->conv.conv_param.dst.det.vid.fps);
 
     return PJ_SUCCESS;
@@ -273 +288 @@
 
     if (vp->dir & PJMEDIA_DIR_CAPTURE) {
-        pjmedia_format_copy(&vp->conv_param.src, &vparam.fmt);
-        pjmedia_format_copy(&vp->conv_param.dst, &prm->vidparam.fmt);
+        pjmedia_format_copy(&vp->conv.conv_param.src, &vparam.fmt);
+        pjmedia_format_copy(&vp->conv.conv_param.dst, &prm->vidparam.fmt);
     } else {
-        pjmedia_format_copy(&vp->conv_param.src, &prm->vidparam.fmt);
-        pjmedia_format_copy(&vp->conv_param.dst, &vparam.fmt);
+        pjmedia_format_copy(&vp->conv.conv_param.src, &prm->vidparam.fmt);
+        pjmedia_format_copy(&vp->conv.conv_param.dst, &vparam.fmt);
     }
 
@@ -511 +526 @@
         vp->frm_mutex = NULL;
     }
-    if (vp->conv) {
-        pjmedia_converter_destroy(vp->conv);
-        vp->conv = NULL;
+    if (vp->conv.conv) {
+        pjmedia_converter_destroy(vp->conv.conv);
+        vp->conv.conv = NULL;
     }
     pj_pool_release(vp->pool);
@@ -577 +592 @@
         
         /* Change the destination format to the new format */
-        pjmedia_format_copy(&vp->conv_param.src,
+        pjmedia_format_copy(&vp->conv.conv_param.src,
                             &event->data.fmt_changed.new_fmt);
         /* Only copy the size here */
-        vp->conv_param.dst.det.vid.size =
+        vp->conv.conv_param.dst.det.vid.size =
             event->data.fmt_changed.new_fmt.det.vid.size;
 
@@ -590 +605 @@
 
         pjmedia_vid_dev_stream_get_param(vp->strm, &vid_param);
-        if (vid_param.fmt.id != vp->conv_param.dst.id ||
+        if (vid_param.fmt.id != vp->conv.conv_param.dst.id ||
             (vid_param.fmt.det.vid.size.h !=
-             vp->conv_param.dst.det.vid.size.h) ||
+             vp->conv.conv_param.dst.det.vid.size.h) ||
             (vid_param.fmt.det.vid.size.w !=
-             vp->conv_param.dst.det.vid.size.w))
+             vp->conv.conv_param.dst.det.vid.size.w))
         {
             status = pjmedia_vid_dev_stream_set_cap(vp->strm,
                                                     PJMEDIA_VID_DEV_CAP_FORMAT,
-                                                    &vp->conv_param.dst);
+                                                    &vp->conv.conv_param.dst);
             if (status != PJ_SUCCESS) {
                 PJ_LOG(3, (THIS_FILE, "failure in changing the format of the "
@@ -639 +654 @@
     pj_status_t status = PJ_SUCCESS;
 
-    if (vp->conv) {
-        dst_frame->buf  = vp->conv_buf;
-        dst_frame->size = vp->conv_buf_size;
-        status = pjmedia_converter_convert(vp->conv,
+    if (vp->conv.conv) {
+        dst_frame->buf  = vp->conv.conv_buf;
+        dst_frame->size = vp->conv.conv_buf_size;
+        status = pjmedia_converter_convert(vp->conv.conv,
                                            src_frame, dst_frame);
     }
@@ -651 +666 @@
 /* Copy frame to buffer. */
 static void copy_frame_to_buffer(pjmedia_vid_port *vp,
-                                        pjmedia_frame *frame)
+                                 pjmedia_frame *frame)
 {
     pj_mutex_lock(vp->frm_mutex);
@@ -665 +680 @@
 
     pj_mutex_lock(vp->frm_mutex);
-    if (vp->conv)
+    if (vp->conv.conv)
         status = convert_frame(vp, vp->frm_buf, frame);
     else
@@ -691 +706 @@
 
     if (vp->stream_role == ROLE_PASSIVE) {
-        vp->frm_buf->size = vp->frm_buf_size;
-        status = pjmedia_vid_dev_stream_get_frame(vp->strm, vp->frm_buf);
+        while (vp->conv.usec_ctr < vp->conv.usec_src) {
+            vp->frm_buf->size = vp->frm_buf_size;
+            status = pjmedia_vid_dev_stream_get_frame(vp->strm, vp->frm_buf);
+            vp->conv.usec_ctr += vp->conv.usec_dst;
+        }
+        vp->conv.usec_ctr -= vp->conv.usec_src;
         if (status != PJ_SUCCESS)
             return;
@@ -699 +718 @@
     //save_rgb_frame(vp->cap_size.w, vp->cap_size.h, vp->frm_buf);
 
-    status = convert_frame(vp, vp->frm_buf, &frame_);
+    frame_.buf = vp->conv.conv_buf;
+    frame_.size = vp->conv.conv_buf_size;
+    status = get_frame_from_buffer(vp, &frame_);
     if (status != PJ_SUCCESS)
         return;
 
-    status = pjmedia_port_put_frame(vp->client_port, 
-                                    (vp->conv? &frame_: vp->frm_buf));
+    status = pjmedia_port_put_frame(vp->client_port, &frame_);
     if (status != PJ_SUCCESS)
         return;
@@ -876 +896 @@
             return status;
 
-        if (!vp->conv)
+        if (!vp->conv.conv)
             pj_memcpy(frame, vp->frm_buf, sizeof(*frame));
     } else {
@@ -907 +927 @@
             return status;
 
-        return pjmedia_vid_dev_stream_put_frame(vp->strm,
-                                                (vp->conv? &frame_: frame));
+        return pjmedia_vid_dev_stream_put_frame(vp->strm, (vp->conv.conv?
+                                                           &frame_: frame));
     } else {
         /* We are passive while the stream is active so we just store the
@@ -931 +951 @@
          * The decoding counterpart is in vid_pasv_port_put_frame().
          */
-        status = pjmedia_vid_dev_stream_get_frame(vp->strm,
-                                                  (vp->conv? vp->frm_buf:
-                                                   frame));
+        status = pjmedia_vid_dev_stream_get_frame(vp->strm, (vp->conv.conv?
+                                                  vp->frm_buf: frame));
         if (status != PJ_SUCCESS)
             return status;