Changeset 4013 for pjproject/trunk

Timestamp:

Apr 4, 2012 4:43:05 AM (13 years ago)

Author:

bennylp

Message:

Misc (re #1446): fixed crash if unregistered format is specified when opening device with the video port

File:

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

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

@@ -176 +176 @@
     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;
@@ -235 +236 @@
     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));
@@ -262 +264 @@
     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));