diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-02-26 09:20:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-26 09:20:14 -0800 |
| commit | 8b33c641621237e321c6907c86be1ac7d25fb8cc (patch) | |
| tree | e4491c8f56afaf03049a997df60f21f23c405959 /vp9 | |
| parent | e211244b02605ff989f443ed31c0098a1338befb (diff) | |
| parent | 8d80c262d11db39212fd96c325c8ca281be79340 (diff) | |
| download | libvpx-8b33c641621237e321c6907c86be1ac7d25fb8cc.tar libvpx-8b33c641621237e321c6907c86be1ac7d25fb8cc.tar.gz libvpx-8b33c641621237e321c6907c86be1ac7d25fb8cc.tar.bz2 libvpx-8b33c641621237e321c6907c86be1ac7d25fb8cc.zip | |
Merge "Using clamp() for active_{best, worst}_quality."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_ratectrl.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c index f3c5684b7..dc6c11816 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; |