Changeset 6149

Timestamp:

Feb 3, 2020 6:26:55 AM (4 years ago)

Author:

ming

Message:

Re #2253
Fix vpx fmtp apply:

• Only adjust the frame rate if it exceeds max-fr
• Maintain aspect ratio when adjusting resolution

File:

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

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

@@ -816 +816 @@
 
         if (fmtp.max_fr > 0) {
-            vfd->fps.num   = fmtp.max_fr;
-            vfd->fps.denum = 1;
+            if ((float)vfd->fps.num/vfd->fps.denum > (float)fmtp.max_fr) {
+                vfd->fps.num   = fmtp.max_fr;
+                vfd->fps.denum = 1;
+            }
         }
         
@@ -823 +825 @@
             unsigned max_res = ((int)pj_isqrt(fmtp.max_fs * 8)) * 16;
             
-            /* Do we need to maintain the aspect ratio or scale down
-             * to some predetermined resolution instead (for example,
-             * if the requested resolution is 640x480 and max_res is
-             * 600, should we scale down to 480xx360)?
-             */
-            if (vfd->size.w > max_res)
-                vfd->size.w = max_res;
-            if (vfd->size.h > max_res)
-                vfd->size.h = max_res;
+            if (vfd->size.w > max_res || vfd->size.h > max_res) {
+                /* Here we maintain the aspect ratio. Or should we scale down
+                 * to some predetermined resolution instead (for example,
+                 * if the requested resolution is 640x480 and max_res is
+                 * 600, should we scale down to 480x360)?
+                 */
+                unsigned larger = (vfd->size.w > vfd->size.h)?
+                                  vfd->size.w: vfd->size.h;
+                float scale = (float)max_res/larger;
+
+                vfd->size.w = (int)(scale * vfd->size.w);
+                vfd->size.h = (int)(scale * vfd->size.h);
+            }
         }
     }