Changeset 4854

Timestamp:

Jun 4, 2014 3:48:28 AM (10 years ago)

Author:

nanang

Message:

Fix #1769: Fixed maximum size/resolution calculation of H264 video in decoding direction.

File:

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

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

@@ -601 +601 @@
                                     const pjmedia_ratio *fps,
                                     const pjmedia_ratio *ratio,
-                                    pjmedia_rect_size *size)
+                                    pjmedia_rect_size *size,
+                                    pj_bool_t is_decoding)
 {
     pjmedia_ratio def_ratio = { DEFAULT_H264_RATIO_NUM,
@@ -647 +648 @@
     size->w = asp_ratio.num   * scale * 16;
     size->h = asp_ratio.denum * scale * 16;
+
+    /* #1769: for decoding, size is usually used for allocating buffer,
+     * so we need to make sure that frame size is not less than max_fs.
+     */
+    if (is_decoding && ((size->w * size->h) >> 8) < max_fs) {
+        /* Size is less than max_fs, recalculate using ratio 1:1 and
+         * round up the scale.
+         */
+        scale = pj_isqrt(max_fs) + 1;
+        size->w = size->h = scale * 16;
+    }
 
     return PJ_SUCCESS;
@@ -687 +699 @@
                 r.num = vfd->size.w;
                 r.denum = vfd->size.h;
-                find_highest_res(&fmtp, &vfd->fps, &r, &vfd->size);
+                find_highest_res(&fmtp, &vfd->fps, &r, &vfd->size, PJ_FALSE);
             }
         } else {
@@ -694 +706 @@
             r.num = vfd->size.w;
             r.denum = vfd->size.h;
-            find_highest_res(&fmtp, &vfd->fps, &r, &vfd->size);
+            find_highest_res(&fmtp, &vfd->fps, &r, &vfd->size, PJ_FALSE);
         }
 
@@ -733 +745 @@
         r.num = vfd->size.w;
         r.denum = vfd->size.h;
-        find_highest_res(&fmtp, &vfd->fps, &r, &highest_size);
+        find_highest_res(&fmtp, &vfd->fps, &r, &highest_size, PJ_TRUE);
         if (vfd->size.w * vfd->size.h < highest_size.w * highest_size.h)
             vfd->size = highest_size;