ref: 76035d16d9b01d15a9fa873e579bd5c923c4bec3
parent: 148c57d231397900f2a17cb15e8e3efdb6ab6560
parent: 5b724fc78e429bfc50f2c5cfe6770769ee2b7be8
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Sep 24 06:32:37 EDT 2014
Merge "Fix build issue with stats enabled."
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2495,11 +2495,12 @@
cpi->rc.total_target_vs_actual,
(cpi->rc.starting_buffer_level - cpi->rc.bits_off_target),
cpi->rc.total_actual_bits, cm->base_qindex,
- vp9_convert_qindex_to_q(cm->base_qindex),
- (double)vp9_dc_quant(cm->base_qindex, 0) / 4.0,
- vp9_convert_qindex_to_q(cpi->twopass.active_worst_quality),
+ vp9_convert_qindex_to_q(cm->base_qindex, cm->bit_depth),
+ (double)vp9_dc_quant(cm->base_qindex, 0, cm->bit_depth) / 4.0,
+ vp9_convert_qindex_to_q(cpi->twopass.active_worst_quality,
+ cm->bit_depth),
cpi->rc.avg_q,
- vp9_convert_qindex_to_q(cpi->oxcf.cq_level),
+ vp9_convert_qindex_to_q(cpi->oxcf.cq_level, cm->bit_depth),
cpi->refresh_last_frame, cpi->refresh_golden_frame,
cpi->refresh_alt_ref_frame, cm->frame_type, cpi->rc.gfu_boost,
cpi->twopass.bits_left,