shithub: libvpx

Download patch

ref: 944e3e71b77f3ee3769dccc0e07709a47babd2be
parent: c308b8261b6f9d9be677dbc2838f5c172df3325c
parent: e219622b80ea29a7f657bcc0e52ca77b2e4dd166
author: Deb Mukherjee <[email protected]>
date: Fri Jun 6 00:43:15 EDT 2014 

Merge "Fixes qindex for first frame in 1-pass cq/q modes"


--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -428,7 +428,6 @@
                                              : rc->last_q[INTER_FRAME] * 2;
     }
   }
-
   return MIN(active_worst_quality, rc->worst_quality);
 }
 
@@ -639,7 +638,7 @@
       int delta_qindex = vp9_compute_qdelta(rc, last_boosted_q,
                                             last_boosted_q * 0.75);
       active_best_quality = MAX(qindex + delta_qindex, rc->best_quality);
-    } else if (cm->current_video_frame > 0) {
+    } else {
       // not first frame of one pass and kf_boost is set
       double q_adj_factor = 1.0;
       double q_val;
@@ -982,7 +981,6 @@
   } else {
     q = rc_pick_q_and_bounds_two_pass(cpi, bottom_index, top_index);
   }
-
   if (cpi->sf.use_nonrd_pick_mode) {
     if (cpi->sf.force_frame_boost == 1)
       q -= cpi->sf.max_delta_qindex;