Changeset 3509

Timestamp:

Apr 8, 2011 4:04:25 AM (14 years ago)

Author:

ming

Message:

Re #1213:

• Add pjmedia_frame_copy()
• Add converter for renderer videoport
• Add checking in SDL device since it may receive a frame size bigger than expected

Location:

pjproject/branches/projects/2.0-dev/pjmedia

Files:

• include/pjmedia/frame.h (modified) (2 diffs)
• src/pjmedia-videodev/sdl_dev.c (modified) (2 diffs)
• src/pjmedia/videoport.c (modified) (16 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/frame.h

@@ -106 +106 @@
 #pragma pack()
 
+/**
+ * Copy one frame to another. If the destination frame's size is smaller than
+ * the source frame's, the destination buffer will be truncated.
+ *
+ * @param src               Source frame.
+ * @param dst               Destination frame.
+ */
+PJ_INLINE(void) pjmedia_frame_copy(pjmedia_frame *dst,
+                                   const pjmedia_frame *src)
+{
+    dst->type = src->type;
+    dst->timestamp = src->timestamp;
+    dst->bit_info = src->bit_info;
+    dst->size = (dst->size < src->size? dst->size: src->size);
+    pj_memcpy(dst->buf, src->buf, dst->size);
+}
 
 /**
@@ -112 +128 @@
  * @param frm               The #pjmedia_frame_ext.
  * @param src               Subframe data.
- * @param bitlen            Lenght of subframe, in bits.
+ * @param bitlen            Length of subframe, in bits.
  * @param samples_cnt       Number of audio samples in subframe.
  */

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -734 +734 @@
     }
 
-    if (frame->size==0 || frame->buf==NULL)
+    if (frame->size==0 || frame->buf==NULL ||
+        frame->size < stream->vafp.framebytes)
         goto on_return;
 
@@ -746 +747 @@
         }
         
-        pj_memcpy(stream->surf->pixels, frame->buf, frame->size);
+        pj_memcpy(stream->surf->pixels, frame->buf,
+                  stream->vafp.framebytes);
         
         if (SDL_MUSTLOCK(stream->surf)) {

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

@@ -136 +136 @@
     unsigned ptime_usec;
     pjmedia_vid_param vparam;
+    pjmedia_conversion_param conv_param;
 
     PJ_ASSERT_RETURN(pool && prm && p_vid_port, PJ_EINVAL);
@@ -264 +265 @@
     {
         /* Yes, we need converter */
-        pjmedia_conversion_param conv_param;
         const pjmedia_video_format_info *vfi;
         pjmedia_video_apply_fmt_param vafp;
@@ -288 +288 @@
 
         /* Allocate buffer for conversion */
-        vfi = pjmedia_get_video_format_info(NULL, prm->vidparam.fmt.id);
+        vfi = pjmedia_get_video_format_info(NULL, conv_param.dst.id);
         if (!vfi)
             return PJMEDIA_EBADFMT;
 
         pj_bzero(&vafp, sizeof(vafp));
-        vafp.size = prm->vidparam.fmt.det.vid.size;
+        vafp.size = conv_param.dst.det.vid.size;
         status = vfi->apply_fmt(vfi, &vafp);
         if (status != PJ_SUCCESS)
@@ -353 +353 @@
         pjmedia_video_apply_fmt_param vafp;
 
-        vfi = pjmedia_get_video_format_info(NULL, vparam.fmt.id);
+        vfi = pjmedia_get_video_format_info(NULL, vp->cap_conv?
+                                            conv_param.src.id:
+                                            vparam.fmt.id);
         if (!vfi) {
             status = PJ_ENOTFOUND;
@@ -360 +362 @@
 
         pj_bzero(&vafp, sizeof(vafp));
-        vafp.size = vparam.fmt.det.vid.size;
+        vafp.size = (vp->cap_conv? conv_param.src.det.vid.size:
+                     vparam.fmt.det.vid.size);
         status = vfi->apply_fmt(vfi, &vafp);
         if (status != PJ_SUCCESS)
@@ -367 +370 @@
         if (vp->dir & PJMEDIA_DIR_ENCODING) {
             vp->enc_frm_buf = PJ_POOL_ZALLOC_T(pool, pjmedia_frame);
-            vp->enc_frm_buf_size = vafp.framebytes;
-            vp->enc_frm_buf->buf = pj_pool_alloc(pool, vafp.framebytes);
-            vp->enc_frm_buf->size = vafp.framebytes;
+            if (vp->stream_role == ROLE_ACTIVE && vp->cap_conv) {
+                vp->enc_frm_buf_size = vp->cap_conv_buf_size;
+                vp->enc_frm_buf->buf = vp->cap_conv_buf;
+            } else {
+                vp->enc_frm_buf_size = vafp.framebytes;
+                vp->enc_frm_buf->buf = pj_pool_alloc(pool, vafp.framebytes);
+            }
+            vp->enc_frm_buf->size = vp->enc_frm_buf_size;
             vp->enc_frm_buf->type = PJMEDIA_FRAME_TYPE_NONE;
 
@@ -674 +682 @@
     //save_rgb_frame(vp->cap_size.w, vp->cap_size.h, vp->enc_frm_buf);
 
-    frame = *vp->enc_frm_buf;
     if (vp->cap_conv) {
         frame.buf  = vp->cap_conv_buf;
@@ -684 +691 @@
     }
 
-    status = pjmedia_port_put_frame(vp->client_port, &frame);
+    status = pjmedia_port_put_frame(vp->client_port, (vp->cap_conv?
+                                                      &frame:
+                                                      vp->enc_frm_buf));
 }
 
@@ -694 +703 @@
     pjmedia_vid_port *vp = (pjmedia_vid_port*)user_data;
     pj_status_t status;
+    pjmedia_frame frame;
     unsigned frame_ts = vp->rend_clocksrc.clock_rate / 1000 *
                         vp->rend_clocksrc.ptime_usec / 1000;
@@ -815 +825 @@
         return;
 
-    status = pjmedia_vid_dev_stream_put_frame(vp->strm, vp->dec_frm_buf);
-}
-
-static void copy_frame(pjmedia_frame *dst, const pjmedia_frame *src)
-{
-    PJ_ASSERT_ON_FAIL(dst->size >= src->size, return);
-
-    pj_memcpy(dst, src, sizeof(*src));
-    pj_memcpy(dst->buf, src->buf, src->size);
-    dst->size = src->size;
+    if (vp->cap_conv) {
+        frame.buf  = vp->cap_conv_buf;
+        frame.size = vp->cap_conv_buf_size;
+        status = pjmedia_converter_convert(vp->cap_conv,
+                                           vp->dec_frm_buf, &frame);
+        if (status != PJ_SUCCESS)
+            return;
+    }
+
+    status = pjmedia_vid_dev_stream_put_frame(vp->strm, (vp->cap_conv?
+                                                         &frame:
+                                                         vp->dec_frm_buf));
 }
 
@@ -834 +846 @@
     pjmedia_frame frame_;
 
-    frame_ = *frame;
     if (vp->cap_conv) {
         pj_status_t status;
@@ -844 +855 @@
         if (status != PJ_SUCCESS)
             return status;
+        frame = &frame_;
     }
 
     if (vp->role==ROLE_ACTIVE) {
         if (vp->client_port)
-            return pjmedia_port_put_frame(vp->client_port, &frame_);
+            return pjmedia_port_put_frame(vp->client_port, frame);
     } else {
-        pj_mutex_lock(vp->enc_frm_mutex);
-        copy_frame(vp->enc_frm_buf, &frame_);
-        pj_mutex_unlock(vp->enc_frm_mutex);
+        if (!vp->cap_conv) {
+            pj_mutex_lock(vp->enc_frm_mutex);
+            pjmedia_frame_copy(vp->enc_frm_buf, frame);
+            pj_mutex_unlock(vp->enc_frm_mutex);
+        }
     }
     if (vp->strm_cb.capture_cb)
-        return (*vp->strm_cb.capture_cb)(stream, vp->strm_cb_data, &frame_);
+        return (*vp->strm_cb.capture_cb)(stream, vp->strm_cb_data, frame);
     return PJ_SUCCESS;
 }
@@ -877 +891 @@
     } else {
         pj_mutex_lock(vp->dec_frm_mutex);
-        copy_frame(frame, vp->dec_frm_buf);
+        pjmedia_frame_copy(frame, vp->dec_frm_buf);
         pj_mutex_unlock(vp->dec_frm_mutex);
     }
@@ -901 +915 @@
     struct vid_pasv_port *vpp = (struct vid_pasv_port*)this_port;
     pjmedia_vid_port *vp = vpp->vp;
+    pjmedia_frame frame_;
+    
+    if (vp->cap_conv) {
+        pj_status_t status;
+        
+        frame_.buf  = vp->cap_conv_buf;
+        frame_.size = vp->cap_conv_buf_size;
+        status = pjmedia_converter_convert(vp->cap_conv,
+                                           frame, &frame_);
+        if (status != PJ_SUCCESS)
+            return status;
+        frame = &frame_;
+    }    
 
     if (vp->stream_role==ROLE_PASSIVE) {
@@ -906 +933 @@
     } else {
         pj_mutex_lock(vp->dec_frm_mutex);
-        copy_frame(vp->dec_frm_buf, frame);
+        pjmedia_frame_copy(vp->dec_frm_buf, frame);
         pj_mutex_unlock(vp->dec_frm_mutex);
     }
@@ -918 +945 @@
     struct vid_pasv_port *vpp = (struct vid_pasv_port*)this_port;
     pjmedia_vid_port *vp = vpp->vp;
+    pj_status_t status;
 
     if (vp->stream_role==ROLE_PASSIVE) {
+        if (vp->cap_conv)
+            vp->enc_frm_buf->size = vp->enc_frm_buf_size;
+        status = pjmedia_vid_dev_stream_get_frame(vp->strm,
+                                                  (vp->cap_conv?
+                                                   vp->enc_frm_buf:
+                                                   frame));
+        if (status != PJ_SUCCESS)
+            return status;
+
         if (vp->cap_conv) {
-            pj_status_t status;
-
-            vp->enc_frm_buf->size = vp->enc_frm_buf_size;
-            status = pjmedia_vid_dev_stream_get_frame(vp->strm, vp->enc_frm_buf);
-            if (status != PJ_SUCCESS)
-                return status;
-
             status = pjmedia_converter_convert(vp->cap_conv,
                                                vp->enc_frm_buf, frame);
             if (status != PJ_SUCCESS)
                 return status;
-        } else {
-            return pjmedia_vid_dev_stream_get_frame(vp->strm, frame);
-        }
+        }       
     } else {
         pj_mutex_lock(vp->enc_frm_mutex);
-        copy_frame(frame, vp->enc_frm_buf);
+        pjmedia_frame_copy(frame, vp->enc_frm_buf);
         pj_mutex_unlock(vp->enc_frm_mutex);
     }