From aaa43ed38326f6df346b9156e79a12562cf1ffdd Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Fri, 24 Jan 2014 13:46:56 -0800 Subject: [PATCH] Clamping active_{best, worst}_quality values. Change-Id: If370f83080b403e417716d1edad58fdaa2b90170 --- vp9/encoder/vp9_ratectrl.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index 3c816a3d0..a5911bef2 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -695,17 +695,10 @@ int vp9_rc_pick_q_and_adjust_q_bounds(const VP9_COMP *cpi, } // Clip the active best and worst quality values to limits - if (active_worst_quality > rc->worst_quality) - active_worst_quality = rc->worst_quality; - - if (active_best_quality < rc->best_quality) - active_best_quality = rc->best_quality; - - if (active_best_quality > rc->worst_quality) - active_best_quality = rc->worst_quality; - - if (active_worst_quality < active_best_quality) - active_worst_quality = active_best_quality; + active_best_quality = clamp(active_best_quality, + rc->best_quality, rc->worst_quality); + active_worst_quality = clamp(active_worst_quality, + active_best_quality, rc->worst_quality); *top_index = active_worst_quality; *bottom_index = active_best_quality;