diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-01-24 13:46:56 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-01-27 12:58:31 -0800 |
| commit | aaa43ed38326f6df346b9156e79a12562cf1ffdd (patch) | |
| tree | 228350e0e6f171d2d63f9a6bfb1d8dcfe5e00288 /vp9/encoder/vp9_ratectrl.c | |
| parent | 1c96e3985e0fab5b288830deb44054bd3e5f0590 (diff) | |
| download | libvpx-aaa43ed38326f6df346b9156e79a12562cf1ffdd.tar libvpx-aaa43ed38326f6df346b9156e79a12562cf1ffdd.tar.gz libvpx-aaa43ed38326f6df346b9156e79a12562cf1ffdd.tar.bz2 libvpx-aaa43ed38326f6df346b9156e79a12562cf1ffdd.zip | |
Clamping active_{best, worst}_quality values.
Change-Id: If370f83080b403e417716d1edad58fdaa2b90170
Diffstat (limited to 'vp9/encoder/vp9_ratectrl.c')
| -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 3c816a3d0..a5911bef2 100644 --- a/vp9/encoder/vp9_ratectrl.c +++ b/vp9/encoder/vp9_ratectrl.c @@ -695,17 +695,10 @@ int vp9_rc_pick_q_and_adjust_q_bounds(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; |