Changeset 5868

Timestamp:

Aug 28, 2018 2:00:05 AM (6 years ago)

Author:

ming

Message:

Re #2103:
A couple of improvements:

• Now initialize both video port's renderer AND capture buffer
• Support RGB format as well.

Known limitation: YUV currently only supports I420 and YV12

File:

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

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

@@ -166 +166 @@
 }
 
-static pj_status_t get_vafp(const pjmedia_format *fmt,
-                            pjmedia_video_apply_fmt_param *vafp)
+static pj_status_t get_vfi(const pjmedia_format *fmt,
+                           const pjmedia_video_format_info **p_vfi,
+                           pjmedia_video_apply_fmt_param *vafp)
 {
     const pjmedia_video_format_info *vfi;
@@ -174 +175 @@
     if (!vfi)
         return PJMEDIA_EBADFMT;
+
+    if (p_vfi) *p_vfi = vfi;
 
     pj_bzero(vafp, sizeof(*vafp));
@@ -212 +215 @@
 
         /* Allocate buffer for conversion */
-        status = get_vafp(&vp->conv.conv_param.dst, &vafp);
+        status = get_vfi(&vp->conv.conv_param.dst, NULL, &vafp);
         if (status != PJ_SUCCESS)
             return status;
@@ -656 +659 @@
         pjmedia_video_apply_fmt_param vafp;
 
-        status = get_vafp(&vp->conv.conv_param.src, &vafp);
+        status = get_vfi(&vp->conv.conv_param.src, NULL, &vafp);
         if (status != PJ_SUCCESS)
             goto on_error;
@@ -773 +776 @@
         goto on_error;
 
-    if ((vp->dir & PJMEDIA_DIR_RENDER) &&
-         (vp->conv.conv_param.dst.id == PJMEDIA_FORMAT_I420 ||
-          vp->conv.conv_param.dst.id == PJMEDIA_FORMAT_YV12))
+    /* Initialize buffer with black color */
     {
+        const pjmedia_video_format_info *vfi;
+        const pjmedia_format *fmt;
         pjmedia_video_apply_fmt_param vafp;
         pj_status_t status;
@@ -782 +785 @@
 
         pj_bzero(&frame, sizeof(pjmedia_frame));
-        frame.buf = (vp->conv.conv? vp->conv.conv_buf: vp->frm_buf->buf);
-        frame.size = (vp->conv.conv? vp->conv.conv_buf_size:
-                      vp->frm_buf_size);
-
-        status = get_vafp(&vp->conv.conv_param.dst, &vafp);
+        frame.buf = vp->frm_buf->buf;
+        frame.size = vp->frm_buf_size;
+
+        fmt = &vp->conv.conv_param.src;
+        status = get_vfi(fmt, &vfi, &vafp);
         if (status == PJ_SUCCESS && frame.buf) {
             frame.type = PJMEDIA_FRAME_TYPE_VIDEO;
@@ -792 +795 @@
             frame.size = vafp.framebytes;
             
-            /* Black initial render screen for I420/YV12 format */
-            pj_memset(frame.buf, 16, vafp.plane_bytes[0]);
-            pj_memset((pj_uint8_t*)frame.buf + vafp.plane_bytes[0],
-                      0x80, vafp.plane_bytes[1] * 2);
-
-            pjmedia_vid_dev_stream_put_frame(vp->strm, &frame);
+            if (vfi->color_model == PJMEDIA_COLOR_MODEL_RGB) {
+                pj_memset(frame.buf, 0, vafp.framebytes);
+            } else if (fmt->id == PJMEDIA_FORMAT_I420 ||
+                       fmt->id == PJMEDIA_FORMAT_YV12)
+            {           
+                pj_memset(frame.buf, 16, vafp.plane_bytes[0]);
+                pj_memset((pj_uint8_t*)frame.buf + vafp.plane_bytes[0],
+                          0x80, vafp.plane_bytes[1] * 2);
+            }
         }
     }