ref: ad6fe4a88c9d051a34c85d3f422cde5819f2bbdf
parent: 8196cc85f819f49d10c01ddba63975fd5a282aae
parent: caa1b28be3abb8173607601b733be5f1e00a6466
author: John Koleszar <jkoleszar@google.com>
date: Fri May 20 07:23:10 EDT 2011
Merge "bug fix active_worst_quality set below active_best_quality"
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3425,15 +3425,15 @@
buff_lvl_step = (cpi->oxcf.maximum_buffer_size - cpi->oxcf.optimal_buffer_level) / Adjustment;
if (buff_lvl_step)
- {
Adjustment = (cpi->buffer_level - cpi->oxcf.optimal_buffer_level) / buff_lvl_step;
- cpi->active_worst_quality -= Adjustment;
- }
+ else
+ Adjustment = 0;
}
- else
- {
- cpi->active_worst_quality -= Adjustment;
- }
+
+ cpi->active_worst_quality -= Adjustment;
+
+ if(cpi->active_worst_quality < cpi->active_best_quality)
+ cpi->active_worst_quality = cpi->active_best_quality;
}
}
--
⑨