diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-04-04 04:43:05 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-04-04 04:43:05 +0000 |
| commit | 5868f7043173eadd0b1d0813ef9198b3f5037975 (patch) | |
| tree | ace0cb4ce61ceafbd1552d9d853844cd46b6ecd5 | |
| parent | 8f3750ee024a29a101156836adb14a646bb28842 (diff) | |
Misc (re #1446): fixed crash if unregistered format is specified when opening device with the video port
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4013 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia/vid_port.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia/vid_port.c b/pjmedia/src/pjmedia/vid_port.c index ab8d9c7e..8d85d0e3 100644 --- a/pjmedia/src/pjmedia/vid_port.c +++ b/pjmedia/src/pjmedia/vid_port.c @@ -175,6 +175,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_port_create( pj_pool_t *pool, pjmedia_vid_port *vp; const pjmedia_video_format_detail *vfd; char dev_name[64]; + char fmt_name[5]; pjmedia_vid_dev_cb vid_cb; pj_bool_t need_frame_buf = PJ_FALSE; pj_status_t status; @@ -234,11 +235,12 @@ PJ_DEF(pj_status_t) pjmedia_vid_port_create( pj_pool_t *pool, pj_strdup2_with_null(pool, &vp->dev_name, di.name); vp->stream_role = di.has_callback ? ROLE_ACTIVE : ROLE_PASSIVE; + pjmedia_fourcc_name(vparam.fmt.id, fmt_name); + PJ_LOG(4,(THIS_FILE, "Opening device %s for %s: format=%s, size=%dx%d @%d:%d fps", dev_name, - vid_dir_name(prm->vidparam.dir), - pjmedia_get_video_format_info(NULL, vparam.fmt.id)->name, + vid_dir_name(prm->vidparam.dir), fmt_name, vfd->size.w, vfd->size.h, vfd->fps.num, vfd->fps.denum)); @@ -261,8 +263,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_port_create( pj_pool_t *pool, PJ_LOG(4,(THIS_FILE, "Device %s opened: format=%s, size=%dx%d @%d:%d fps", - dev_name, - pjmedia_get_video_format_info(NULL, vparam.fmt.id)->name, + dev_name, fmt_name, vparam.fmt.det.vid.size.w, vparam.fmt.det.vid.size.h, vparam.fmt.det.vid.fps.num, vparam.fmt.det.vid.fps.denum)); |