Merge "vp9_ratectrl.c: apply clang-format"

This commit is contained in:
James Zern
2016-08-04 20:01:45 +00:00
committed by Gerrit Code Review

View File

@@ -2115,9 +2115,9 @@ void adjust_gf_boost_lag_one_pass_vbr(VP9_COMP *cpi, uint64_t avg_sad_current) {
VPXMIN(15, (3 * rc->baseline_gf_interval) >> 1);
} else if (high_content) {
rc->gfu_boost = DEFAULT_GF_BOOST >> 1;
rc->baseline_gf_interval = (rate_err > 3.0) ?
VPXMAX(10, rc->baseline_gf_interval >> 1) :
VPXMAX(6, rc->baseline_gf_interval >> 1);
rc->baseline_gf_interval = (rate_err > 3.0)
? VPXMAX(10, rc->baseline_gf_interval >> 1)
: VPXMAX(6, rc->baseline_gf_interval >> 1);
}
// Check for constraining gf_interval for up-coming scene/content changes,
// or for up-coming key frame, whichever is closer.