commit f2be91980e5c9eca7563266ba0b0411134d03d87
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Mon Aug 03 12:13:51 2015 +0530
committer The Android Automerger <android-build@google.com> Mon Aug 03 16:12:17 2015 -0700
tree 182c0fb5ce424f629aee845516aa88457fbd9023
parent ee09b73b46c851b6625a07903835c708acb862f9

Encoder: Fixed an issue in handling FPS greater than 60

FPS > 60 was resulting in an integer overflow, so using float now.

Bug: 22504214
Change-Id: I4626ba6a43167c00c42dd6440df37bd1eb1f151a

encoder/ih264e_time_stamp.c

diff --git a/encoder/ih264e_time_stamp.c b/encoder/ih264e_time_stamp.c
index cd829b5..85b75a3 100644
--- a/encoder/ih264e_time_stamp.c
+++ b/encoder/ih264e_time_stamp.c
@@ -84,6 +84,7 @@
 #include "ih264e_structs.h"
 #include "ih264e_rc_mem_interface.h"
 #include "ih264e_time_stamp.h"
+#include "irc_common.h"
 #include "irc_rate_control_api.h"
 
 
@@ -278,8 +279,15 @@
      * frame times increase */
     WORD32 i4_gcd = gcd(u4_src_frm_rate, u4_tgt_frm_rate);
 
-    ps_frame_time->common_time_base = (u4_src_frm_rate * u4_tgt_frm_rate)
-                    / i4_gcd;
+    /* Avoiding overflow by doing calculations in float */
+    number_t s_src_frm_rate, s_tgt_frm_rate, s_gcd, s_common_time_base, s_numerator;
+
+    SET_VAR_Q(s_src_frm_rate, u4_src_frm_rate, 0);
+    SET_VAR_Q(s_tgt_frm_rate, u4_tgt_frm_rate, 0);
+    SET_VAR_Q(s_gcd, i4_gcd, 0);
+    mult32_var_q(s_src_frm_rate, s_tgt_frm_rate, &s_numerator);
+    div32_var_q(s_numerator, s_gcd, &s_common_time_base);
+    number_t_to_word32(s_common_time_base, &(ps_frame_time->common_time_base));
 
     /* The source and target increment per vop is initialized */
     ps_frame_time->u4_src_frm_time_incr = ps_frame_time->common_time_base