shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- 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;