diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2015-04-09 06:52:20 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2015-04-09 06:52:20 +0000 |
| commit | ca570849230de7a8785c8437ab0d4f9e2359f7b4 (patch) | |
| tree | 4f44486286f2a8dcf9da78bde0be75b8c726045c | |
| parent | d12625a21c03e9e23ceb8f4e66dc383d87d748e7 (diff) | |
Re #1831: Fixed bug of requested format overwritten by supported format, caused no converter is created when needed, assertion in pjmedia-test, etc. Also rearranged some related logs.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5057 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/src/pjmedia/vid_port.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/pjmedia/src/pjmedia/vid_port.c b/pjmedia/src/pjmedia/vid_port.c index 3690ca13..4cb3739f 100644 --- a/pjmedia/src/pjmedia/vid_port.c +++ b/pjmedia/src/pjmedia/vid_port.c @@ -524,6 +524,13 @@ PJ_DEF(pj_status_t) pjmedia_vid_port_create( pj_pool_t *pool, pj_ansi_snprintf(dev_name, sizeof(dev_name), "%s [%s]", di.name, di.driver); + 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), fmt_name, + vfd->size.w, vfd->size.h, + vfd->fps.num, vfd->fps.denum)); if (di.dir == PJMEDIA_DIR_RENDER) { /* Find the matching format. If no exact match is found, find @@ -545,13 +552,6 @@ PJ_DEF(pj_status_t) pjmedia_vid_port_create( pj_pool_t *pool, test_find_closest_fmt(&di); #endif - pjmedia_fourcc_name(vparam.fmt.id, fmt_name); - PJ_LOG(4,(THIS_FILE, - "Finding best match for %s(%s) format=%s, size=%dx%d "\ - "@%d:%d fps", - dev_name, vid_dir_name(prm->vidparam.dir), fmt_name, - vfd->size.w, vfd->size.h, vfd->fps.num, vfd->fps.denum)); - match_prop = find_closest_fmt(prm->vidparam.fmt.id, &vfd->size, &vfd->fps, @@ -563,22 +563,12 @@ PJ_DEF(pj_status_t) pjmedia_vid_port_create( pj_pool_t *pool, { vparam.fmt.id = match_prop.id; vparam.fmt.det.vid.size = match_prop.size; - vfd->size = match_prop.size; } } 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), fmt_name, - vfd->size.w, vfd->size.h, - vfd->fps.num, vfd->fps.denum)); - ptime_usec = PJMEDIA_PTIME(&vfd->fps); pjmedia_clock_src_init(&vp->clocksrc, PJMEDIA_TYPE_VIDEO, prm->vidparam.clock_rate, ptime_usec); |