Commit 22a51d9e authored by Hui Su's avatar Hui Su Committed by Yaowu Xu

intrabc: do not transmit delta_lf_present_flag

BUG=aomedia:1230

Change-Id: I8a66b6303752b77a09cca1fe6890137146c50d1e
parent 7ebfaf4f
......@@ -3051,7 +3051,10 @@ static size_t read_uncompressed_header(AV1Decoder *pbi,
xd->prev_qindex = cm->base_qindex;
cm->delta_q_res = 1 << aom_rb_read_literal(rb, 2);
#if CONFIG_EXT_DELTA_Q
cm->delta_lf_present_flag = aom_rb_read_bit(rb);
#if CONFIG_INTRABC
if (!cm->allow_intrabc || !NO_FILTER_FOR_IBC)
#endif // CONFIG_INTRABC
cm->delta_lf_present_flag = aom_rb_read_bit(rb);
if (cm->delta_lf_present_flag) {
xd->prev_delta_lf_from_base = 0;
cm->delta_lf_res = 1 << aom_rb_read_literal(rb, 2);
......
......@@ -4148,7 +4148,12 @@ static void write_uncompressed_header_obu(AV1_COMP *cpi,
aom_wb_write_literal(wb, OD_ILOG_NZ(cm->delta_q_res) - 1, 2);
xd->prev_qindex = cm->base_qindex;
#if CONFIG_EXT_DELTA_Q
aom_wb_write_bit(wb, cm->delta_lf_present_flag);
#if CONFIG_INTRABC
if (cm->allow_intrabc && NO_FILTER_FOR_IBC)
assert(cm->delta_lf_present_flag == 0);
else
#endif // CONFIG_INTRABC
aom_wb_write_bit(wb, cm->delta_lf_present_flag);
if (cm->delta_lf_present_flag) {
aom_wb_write_literal(wb, OD_ILOG_NZ(cm->delta_lf_res) - 1, 2);
xd->prev_delta_lf_from_base = 0;
......
......@@ -4082,6 +4082,9 @@ static void encode_frame_internal(AV1_COMP *cpi) {
#if CONFIG_INTRABC
// If intrabc is allowed but never selected, reset the allow_intrabc flag.
if (cm->allow_intrabc && !cpi->intrabc_used) cm->allow_intrabc = 0;
#if CONFIG_EXT_DELTA_Q
if (cm->allow_intrabc) cm->delta_lf_present_flag = 0;
#endif // CONFIG_EXT_DELTA_Q
#endif // CONFIG_INTRABC
}
......
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