Commit 0090c8fb authored by Thomas Davies's avatar Thomas Davies

Turn on delta_q by default.

Also make sure that qindex is clipped to the quantizer range.

Change-Id: I3163da4b45e190f9ab34982d1bbbefa5cba7514e
parent 81f48159
...@@ -1851,9 +1851,10 @@ void av1_init_plane_quantizers(const AV1_COMP *cpi, MACROBLOCK *x, ...@@ -1851,9 +1851,10 @@ void av1_init_plane_quantizers(const AV1_COMP *cpi, MACROBLOCK *x,
const QUANTS *const quants = &cpi->quants; const QUANTS *const quants = &cpi->quants;
#if CONFIG_DELTA_Q #if CONFIG_DELTA_Q
int current_q_index = cpi->oxcf.aq_mode == DELTA_AQ int current_q_index = AOMMAX(
? cm->base_qindex + xd->delta_qindex 0, AOMMIN(QINDEX_RANGE - 1, cpi->oxcf.aq_mode == DELTA_AQ
: cm->base_qindex; ? cm->base_qindex + xd->delta_qindex
: cm->base_qindex));
const int qindex = av1_get_qindex(&cm->seg, segment_id, current_q_index); const int qindex = av1_get_qindex(&cm->seg, segment_id, current_q_index);
#else #else
const int qindex = av1_get_qindex(&cm->seg, segment_id, cm->base_qindex); const int qindex = av1_get_qindex(&cm->seg, segment_id, cm->base_qindex);
......
...@@ -471,6 +471,9 @@ post_process_cmdline() { ...@@ -471,6 +471,9 @@ post_process_cmdline() {
# Enable reference_buffer by default # Enable reference_buffer by default
soft_enable reference_buffer soft_enable reference_buffer
#Enable delta_q by default
soft_enable delta_q
# Enable daala_ec by default # Enable daala_ec by default
! enabled ans && soft_enable daala_ec ! enabled ans && soft_enable daala_ec
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment