Changeset 4952 for pjproject/trunk/pjmedia/src/pjmedia/vid_codec_util.c

Timestamp:

Oct 17, 2014 6:47:02 AM (10 years ago)

Author:

ming

Message:

Fixed #1799: Fix finding highest resolution for H264

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_codec_util.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_codec_util.c

@@ -40 +40 @@
 
 /* Default frame rate, if not specified */
-#define DEFAULT_H264_FPS_NUM        15
+#define DEFAULT_H264_FPS_NUM        10
 #define DEFAULT_H264_FPS_DENUM      1
 
 /* Default aspect ratio, if not specified */
-#define DEFAULT_H264_RATIO_NUM      16
-#define DEFAULT_H264_RATIO_DENUM    9
+#define DEFAULT_H264_RATIO_NUM      4
+#define DEFAULT_H264_RATIO_DENUM    3
 
 
@@ -637 +637 @@
 
     /* Check if the specified ratio is using big numbers
-     * (not normalizable), override it with default ratio!
+     * (not normalizable), override it!
      */
-    if ((int)max_fs < asp_ratio.num * asp_ratio.denum)
-        asp_ratio = def_ratio;
+    if ((int)max_fs < asp_ratio.num * asp_ratio.denum) {
+        if ((int)max_fs >= def_ratio.num * def_ratio.denum)
+            asp_ratio = def_ratio;
+        else
+            asp_ratio.num = asp_ratio.denum = 1;
+    }
 
     /* Calculate the scale factor for size */