commit 6432ae4902cf07a9751b02c2bc5ff9e9beca8960
author Dmitry Kovalev <dkovalev@google.com> Wed Feb 05 15:53:00 2014 -0800
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Wed Feb 05 15:53:00 2014 -0800
tree 26f352852fea666e9bfa4201b5a2e41c1cbbf819
parent 9d477bd2fa286bc4bd3e532c5b563f53e4035eef
parent aaa43ed38326f6df346b9156e79a12562cf1ffdd

Merge "Clamping active_{best, worst}_quality values."

vp9/encoder/vp9_ratectrl.c

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 1172012..abbf39b 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -555,17 +555,10 @@
   }
 
   // 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;