Changeset 5057 for pjproject

Timestamp:

Apr 9, 2015 6:52:20 AM (10 years ago)

Author:

nanang

Message:

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.

File:

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

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

@@ -525 +525 @@
     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) {
@@ -546 +553 @@
 #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,                            
@@ -564 +564 @@
             vparam.fmt.id = match_prop.id;
             vparam.fmt.det.vid.size = match_prop.size;
-            vfd->size = match_prop.size;
         }
     }
@@ -570 +569 @@
     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);