Changeset 5948

Timestamp:

Mar 8, 2019 9:22:21 AM (6 years ago)

Author:

ming

Message:

Re #2181: Fixed assertion in darwin_dev pj_assert(frame->size >= stream->frame_size);

But the problem itself is caused by video port, which passes the wrong frame size when the video capture is passive.

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_port.c (modified) (1 diff)

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

@@ -1353 +1353 @@
          * The decoding counterpart is in vid_pasv_port_put_frame().
          */
-        status = pjmedia_vid_dev_stream_get_frame(vp->strm, (vp->conv.conv?
-                                                  vp->frm_buf: frame));
+        pjmedia_frame *get_frm = vp->conv.conv? vp->frm_buf : frame;
+
+        if (vp->conv.conv)
+            get_frm->size = vp->frm_buf_size;
+
+        status = pjmedia_vid_dev_stream_get_frame(vp->strm, get_frm);
         if (status != PJ_SUCCESS)
             return status;