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

This commit is contained in:
Dmitry Kovalev 2014-02-05 15:53:00 -08:00 committed by Gerrit Code Review
commit 6432ae4902

View File

@ -555,17 +555,10 @@ static int rc_pick_q_and_adjust_q_bounds_one_pass(const VP9_COMP *cpi,
} }
// Clip the active best and worst quality values to limits // Clip the active best and worst quality values to limits
if (active_worst_quality > rc->worst_quality) active_best_quality = clamp(active_best_quality,
active_worst_quality = rc->worst_quality; rc->best_quality, rc->worst_quality);
active_worst_quality = clamp(active_worst_quality,
if (active_best_quality < rc->best_quality) active_best_quality, rc->worst_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;
*top_index = active_worst_quality; *top_index = active_worst_quality;
*bottom_index = active_best_quality; *bottom_index = active_best_quality;