shithub: libvpx

Download patch

ref: 4c1a9fb8db04da8f09543ee3b224b9f59fa63e61
parent: ee01b78ddd88a9156d6b926fc932d3cdfc070df9
author: Marco <[email protected]>
date: Thu Sep 15 11:14:46 EDT 2016 

vp9: Small code cleanup.

Remove the experiment LIMIT_QP_ONEPASS_VBR_LAG, as its
not currently used and no plan to use in near future.

Change-Id: Ib069f8d7225195be04b765d0ab477510dfba6a3b


--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -45,8 +45,6 @@
 
 #define FRAME_OVERHEAD_BITS 200
 
-#define LIMIT_QP_ONEPASS_VBR_LAG 0
-
 #if CONFIG_VP9_HIGHBITDEPTH
 #define ASSIGN_MINQ_TABLE(bit_depth, name)                   \
   do {                                                       \
@@ -945,14 +943,6 @@
   active_worst_quality =
       clamp(active_worst_quality, active_best_quality, rc->worst_quality);
 
-#if LIMIT_QP_ONEPASS_VBR_LAG
-  if (oxcf->lag_in_frames > 0 && oxcf->rc_mode == VPX_VBR) {
-    if (rc->force_qpmin > 0 && active_best_quality < rc->force_qpmin)
-      active_best_quality =
-          clamp(active_best_quality, rc->force_qpmin, rc->worst_quality);
-  }
-#endif
-
   *top_index = active_worst_quality;
   *bottom_index = active_best_quality;
 
@@ -2145,13 +2135,6 @@
     }
     target = calc_pframe_target_size_one_pass_vbr(cpi);
     vp9_rc_set_frame_target(cpi, target);
-#if LIMIT_QP_ONEPASS_VBR_LAG
-    if (rc->avg_frame_low_motion > 85 &&
-        avg_source_sad_lag < (sad_thresh1 >> 1))
-      rc->force_qpmin = 48;
-    else
-      rc->force_qpmin = 0;
-#endif
   }
   rc->prev_avg_source_sad_lag = avg_source_sad_lag;
 }