From 9e612763f0eeab6c231afe6a2821ebed529715c9 Mon Sep 17 00:00:00 2001 From: Zoe Liu Date: Fri, 22 Jan 2016 17:13:03 -0800 Subject: Cleaned a code in define_gf_group() for firstpass Change-Id: I0b8eff9e74e3446024482d011ec4fb28b19136d3 --- vp9/encoder/vp9_firstpass.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'vp9/encoder') diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 43fcdbd2e..aa982f0e9 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -1939,13 +1939,12 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) { // At high Q when there are few bits to spare we are better with a longer // interval to spread the cost of the GF. active_max_gf_interval = 12 + VPXMIN(4, (int_lbq / 6)); - if (active_max_gf_interval < active_min_gf_interval) - active_max_gf_interval = active_min_gf_interval; - if (active_max_gf_interval > rc->max_gf_interval) - active_max_gf_interval = rc->max_gf_interval; + // We have: active_min_gf_interval <= rc->max_gf_interval if (active_max_gf_interval < active_min_gf_interval) active_max_gf_interval = active_min_gf_interval; + else if (active_max_gf_interval > rc->max_gf_interval) + active_max_gf_interval = rc->max_gf_interval; } } -- cgit v1.2.3