Changeset 4252

Timestamp:

Sep 13, 2012 8:08:01 AM (12 years ago)

Author:

ming

Message:

Fixed #1581: Fixed crash in video port when the capturer is passive, its stream is passive, and converter is needed

File:

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

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

@@ -333 +333 @@
                                 prm->vidparam.dir, &prm->vidparam.fmt);
 
-        if (vp->stream_role == ROLE_ACTIVE) {
-            need_frame_buf = PJ_TRUE;
-        }
+        need_frame_buf = PJ_TRUE;
     }
 
@@ -655 +653 @@
 
     if (vp->conv.conv) {
-        dst_frame->buf  = vp->conv.conv_buf;
-        dst_frame->size = vp->conv.conv_buf_size;
+        if (!dst_frame->buf || dst_frame->size < vp->conv.conv_buf_size) {
+            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);