Changeset 3993 for pjproject/trunk

Timestamp:

Mar 29, 2012 8:46:26 AM (13 years ago)

Author:

ming

Message:

Re #1472: Fixed assertion if stream role is passive

File:

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

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

@@ -676 +676 @@
     pj_status_t status;
 
-    pj_assert(vp->role==ROLE_ACTIVE && vp->stream_role==ROLE_PASSIVE);
+    pj_assert(vp->role==ROLE_ACTIVE);
 
     PJ_UNUSED_ARG(ts);
@@ -683 +683 @@
         return;
 
-    vp->frm_buf->size = vp->frm_buf_size;
-    status = pjmedia_vid_dev_stream_get_frame(vp->strm, vp->frm_buf);
-    if (status != PJ_SUCCESS)
-        return;
+    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);
+        if (status != PJ_SUCCESS)
+            return;
+    }
 
     //save_rgb_frame(vp->cap_size.w, vp->cap_size.h, vp->frm_buf);