Commit 9afaec78 authored by Angie Chiang's avatar Angie Chiang
Browse files

Turn on update_scan_count_facade

Change-Id: Ia11ccf105222dd7169e3692af33ead9183ab31e9
parent 99cb0d28
......@@ -421,6 +421,9 @@ static void predict_and_reconstruct_intra_block(
const SCAN_ORDER *scan_order = get_scan(cm, tx_size, tx_type);
const int eob = av1_decode_block_tokens(xd, plane, scan_order, col, row,
tx_size, r, mbmi->segment_id);
#if CONFIG_ADAPT_SCAN
av1_update_scan_count_facade(cm, tx_size, tx_type, pd->dqcoeff, eob);
#endif
inverse_transform_block_intra(xd, plane, tx_type, tx_size, dst,
pd->dst.stride, eob);
}
......@@ -437,7 +440,9 @@ static int reconstruct_inter_block(AV1_COMMON *cm, MACROBLOCKD *const xd,
const SCAN_ORDER *scan_order = get_scan(cm, tx_size, tx_type);
const int eob = av1_decode_block_tokens(xd, plane, scan_order, col, row,
tx_size, r, mbmi->segment_id);
#if CONFIG_ADAPT_SCAN
av1_update_scan_count_facade(cm, tx_size, tx_type, pd->dqcoeff, eob);
#endif
inverse_transform_block_inter(
xd, plane, tx_size, &pd->dst.buf[4 * row * pd->dst.stride + 4 * col],
pd->dst.stride, eob, block_idx);
......
......@@ -464,6 +464,14 @@ static void tokenize_b(int plane, int block, int blk_row, int blk_col,
*tp = t;
#if CONFIG_ADAPT_SCAN
// Since dqcoeff is not available here, we pass qcoeff into
// av1_update_scan_count_facade(). The update behavior should be the same
// because av1_update_scan_count_facade() only cares if coefficients are zero
// or not.
av1_update_scan_count_facade((AV1_COMMON *)cm, tx_size, tx_type, qcoeff, c);
#endif
av1_set_contexts(xd, pd, tx_size, c > 0, blk_col, blk_row);
}
......
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