Commit e11b68d1 authored by Yaowu Xu's avatar Yaowu Xu Committed by Fred BARBIER

Remove CONFIG_EXT_QM

The experiment is now fully adopted.

Change-Id: I09960ed25defae98d1c3e5ee8bc93691f79677ec
parent 31706b47
......@@ -293,9 +293,7 @@ static int parse_bitdepth_colorspace_sampling(BITSTREAM_PROFILE profile,
}
#endif // CONFIG_COLORSPACE_HEADERS
}
#if CONFIG_EXT_QM
rb->bit_offset += 1; // separate_uv_delta_q
#endif // CONFIG_EXT_QM
#if CONFIG_TIMING_INFO_IN_SEQ_HEADERS
parse_timing_info_header(rb);
#endif
......
......@@ -357,9 +357,8 @@ typedef struct AV1Common {
int u_ac_delta_q;
int v_ac_delta_q;
#if CONFIG_EXT_QM
int separate_uv_delta_q;
#endif
// The dequantizers below are true dequntizers used only in the
// dequantization process. They have the same coefficient
// shift/scale as TX.
......
......@@ -1057,9 +1057,7 @@ static void setup_quantization(AV1_COMMON *const cm,
cm->y_dc_delta_q = read_delta_q(rb);
if (num_planes > 1) {
int diff_uv_delta = 0;
#if CONFIG_EXT_QM
if (cm->separate_uv_delta_q) diff_uv_delta = aom_rb_read_bit(rb);
#endif
cm->u_dc_delta_q = read_delta_q(rb);
cm->u_ac_delta_q = read_delta_q(rb);
if (diff_uv_delta) {
......@@ -1077,11 +1075,9 @@ static void setup_quantization(AV1_COMMON *const cm,
#if CONFIG_AOM_QM_EXT
cm->qm_y = aom_rb_read_literal(rb, QM_LEVEL_BITS);
cm->qm_u = aom_rb_read_literal(rb, QM_LEVEL_BITS);
#if CONFIG_EXT_QM
if (!cm->separate_uv_delta_q)
cm->qm_v = cm->qm_u;
else
#endif
cm->qm_v = aom_rb_read_literal(rb, QM_LEVEL_BITS);
#else
cm->min_qmlevel = aom_rb_read_literal(rb, QM_LEVEL_BITS);
......@@ -2341,9 +2337,7 @@ void av1_read_bitdepth_colorspace_sampling(AV1_COMMON *cm,
#if CONFIG_COLORSPACE_HEADERS
cm->chroma_sample_position = AOM_CSP_UNKNOWN;
#endif // CONFIG_COLORSPACE_HEADERS
#if CONFIG_EXT_QM
cm->separate_uv_delta_q = 0;
#endif // CONFIG_EXT_QM
return;
}
#endif // CONFIG_MONO_VIDEO
......@@ -2390,9 +2384,7 @@ void av1_read_bitdepth_colorspace_sampling(AV1_COMMON *cm,
}
#endif // CONFIG_COLORSPACE_HEADERS
}
#if CONFIG_EXT_QM
cm->separate_uv_delta_q = aom_rb_read_bit(rb);
#endif // CONFIG_EXT_QM
}
#if CONFIG_TIMING_INFO_IN_SEQ_HEADERS
......
......@@ -2176,11 +2176,9 @@ void av1_set_quantizer(AV1_COMMON *cm, int q) {
cm->qm_u = aom_get_qmlevel(cm->base_qindex + cm->u_ac_delta_q,
cm->min_qmlevel, cm->max_qmlevel);
#if CONFIG_EXT_QM
if (!cm->separate_uv_delta_q)
cm->qm_v = cm->qm_u;
else
#endif
cm->qm_v = aom_get_qmlevel(cm->base_qindex + cm->v_ac_delta_q,
cm->min_qmlevel, cm->max_qmlevel);
#endif
......
......@@ -2459,11 +2459,7 @@ static void encode_quantization(const AV1_COMMON *const cm,
if (num_planes > 1) {
int diff_uv_delta = (cm->u_dc_delta_q != cm->v_dc_delta_q) ||
(cm->u_ac_delta_q != cm->v_ac_delta_q);
#if CONFIG_EXT_QM
if (cm->separate_uv_delta_q) aom_wb_write_bit(wb, diff_uv_delta);
#else
assert(!diff_uv_delta);
#endif
write_delta_q(wb, cm->u_dc_delta_q);
write_delta_q(wb, cm->u_ac_delta_q);
if (diff_uv_delta) {
......@@ -2477,11 +2473,9 @@ static void encode_quantization(const AV1_COMMON *const cm,
#if CONFIG_AOM_QM_EXT
aom_wb_write_literal(wb, cm->qm_y, QM_LEVEL_BITS);
aom_wb_write_literal(wb, cm->qm_u, QM_LEVEL_BITS);
#if CONFIG_EXT_QM
if (!cm->separate_uv_delta_q)
assert(cm->qm_u == cm->qm_v);
else
#endif
aom_wb_write_literal(wb, cm->qm_v, QM_LEVEL_BITS);
#else
aom_wb_write_literal(wb, cm->min_qmlevel, QM_LEVEL_BITS);
......@@ -3318,10 +3312,7 @@ static void write_bitdepth_colorspace_sampling(
}
#endif
}
#if CONFIG_EXT_QM
aom_wb_write_bit(wb, cm->separate_uv_delta_q);
#endif
}
#if CONFIG_TIMING_INFO_IN_SEQ_HEADERS
......
......@@ -109,7 +109,6 @@ set(CONFIG_EXT_INTRA_MOD 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_INTRA_MOD2 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_PARTITION 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_PARTITION_TYPES 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_QM 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_SKIP 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_TILE 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_EXT_WARPED_MOTION 1 CACHE NUMBER "AV1 experiment flag.")
......
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