summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2012-03-29 08:46:26 +0000
committerLiong Sauw Ming <ming@teluu.com>2012-03-29 08:46:26 +0000
commit7612c3ae7fc24ae8dcfb12cbe6fb9bad4a59b227 (patch)
treef7e7633a7b6cae87e5cea711e7e811f21fb51c1d
parentdc5497559309bac7b4b68ee416606e2565e2104d (diff)
Re #1472: Fixed assertion if stream role is passive
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3993 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/src/pjmedia/vid_port.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/pjmedia/src/pjmedia/vid_port.c b/pjmedia/src/pjmedia/vid_port.c
index 6c03340f..8e2833d9 100644
--- a/pjmedia/src/pjmedia/vid_port.c
+++ b/pjmedia/src/pjmedia/vid_port.c
@@ -675,17 +675,19 @@ static void enc_clock_cb(const pj_timestamp *ts, void *user_data)
pjmedia_frame frame_;
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);
if (!vp->client_port)
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);