fix keyint mismatch between 1st and 2nd passes of a 2pass encode

git-svn-id: svn://localhost/HandBrake/trunk@3100 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/libhb/encx264.c b/libhb/encx264.c
index 47f3b5a..7199fd9 100644 (file)
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -149,20 +149,15 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
                we still want the same keyframe intervals as the 1st pass,
                so the 1st pass stats won't conflict on frame decisions.    */
             hb_interjob_t * interjob = hb_interjob_get( job->h );
-            param.i_keyint_min     = ( interjob->vrate / interjob->vrate_base ) + 1;
-            param.i_keyint_max = ( 10 * interjob->vrate / interjob->vrate_base ) + 1;
+            param.i_keyint_min =      ( ( (double)interjob->vrate / (double)interjob->vrate_base ) + 0.5 );
+            param.i_keyint_max = ( ( 10 * (double)interjob->vrate / (double)interjob->vrate_base ) + 0.5 );
         }
         else
         {
-            int fps = job->vrate / job->vrate_base;
-
-            /* adjust +1 when fps has remainder to bump
+            /* adjust +0.5 for when fps has remainder to bump
                { 23.976, 29.976, 59.94 } to { 24, 30, 60 } */
-            if (job->vrate % job->vrate_base)
-                fps += 1;
-
-            param.i_keyint_min = fps;
-            param.i_keyint_max = fps * 10;
+            param.i_keyint_min =      ( ( (double)job->vrate / (double)job->vrate_base ) + 0.5 );
+            param.i_keyint_max = ( ( 10 * (double)job->vrate / (double)job->vrate_base ) + 0.5 );
         }
     }