From: Dmitry Kovalev <dkovalev@google.com>
Date: Wed, 26 Feb 2014 02:01:49 +0000 (-0800)
Subject: Using clamp() for active_{best, worst}_quality.
X-Git-Tag: v1.4.0~2263^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d80c262d11db39212fd96c325c8ca281be79340;p=libvpx

Using clamp() for active_{best, worst}_quality.

Change-Id: Ia79f975f54829b8ae6b568ca5c05f4f1f541706f
---

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index f78ebfe18..16c617e22 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -958,17 +958,10 @@ static int rc_pick_q_and_bounds_two_pass(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;