shithub: libvpx

Download patch

ref: 10f62d071c0130ae3309dae053b266815960578e
parent: 31bb7a257017ad6a5ffc5334529fb45ecedf0601
parent: e4234b3f8b704250dfcf8f97096534a3eef114d9
author: Yaowu Xu <yaowu@google.com>
date: Wed Nov 26 02:56:43 EST 2014 

Merge "Separate rate_correction_factor for boosted GFs"


--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -370,7 +370,7 @@
   } else {
     if ((cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame) &&
         !rc->is_src_frame_alt_ref && !cpi->use_svc &&
-        cpi->oxcf.rc_mode != VPX_CBR)
+        (cpi->oxcf.rc_mode != VPX_CBR || cpi->oxcf.gf_cbr_boost_pct > 20))
       return rc->rate_correction_factors[GF_ARF_STD];
     else
       return rc->rate_correction_factors[INTER_NORMAL];
@@ -389,7 +389,7 @@
   } else {
     if ((cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame) &&
         !rc->is_src_frame_alt_ref && !cpi->use_svc &&
-        cpi->oxcf.rc_mode != VPX_CBR)
+        (cpi->oxcf.rc_mode != VPX_CBR || cpi->oxcf.gf_cbr_boost_pct > 20))
       rc->rate_correction_factors[GF_ARF_STD] = factor;
     else
       rc->rate_correction_factors[INTER_NORMAL] = factor;