Commit 68abef8c authored by Alex Converse's avatar Alex Converse

deltaq: Use block size / mask macros

Fixes unit tests with ext-partition

Change-Id: I17184c7321e27763eea5434f0d4425d928c0abcc
parent 67741e0c
......@@ -76,7 +76,7 @@ static int read_delta_qindex(AV1_COMMON *cm, MACROBLOCKD *xd, aom_reader *r,
FRAME_CONTEXT *ec_ctx = cm->fc;
#endif
if ((bsize != BLOCK_64X64 || mbmi->skip == 0) && read_delta_q_flag) {
if ((bsize != BLOCK_LARGEST || mbmi->skip == 0) && read_delta_q_flag) {
#if !CONFIG_EC_MULTISYMBOL
int bit = 1;
abs = 0;
......
......@@ -1602,7 +1602,7 @@ static void pack_inter_mode_mvs(AV1_COMP *cpi, const MODE_INFO *mi,
if (cm->delta_q_present_flag) {
int super_block_upper_left =
((mi_row & MAX_MIB_MASK) == 0) && ((mi_col & MAX_MIB_MASK) == 0);
if ((bsize != BLOCK_64X64 || skip == 0) && super_block_upper_left) {
if ((bsize != BLOCK_LARGEST || skip == 0) && super_block_upper_left) {
assert(mbmi->current_q_index > 0);
int reduced_delta_qindex =
(mbmi->current_q_index - xd->prev_qindex) / cm->delta_q_res;
......@@ -1973,8 +1973,9 @@ static void write_mb_modes_kf(AV1_COMMON *cm, const MACROBLOCKD *xd,
#if CONFIG_DELTA_Q
skip = write_skip(cm, xd, mbmi->segment_id, mi, w);
if (cm->delta_q_present_flag) {
int super_block_upper_left = ((mi_row & 7) == 0) && ((mi_col & 7) == 0);
if ((bsize != BLOCK_64X64 || skip == 0) && super_block_upper_left) {
int super_block_upper_left =
((mi_row & MAX_MIB_MASK) == 0) && ((mi_col & MAX_MIB_MASK) == 0);
if ((bsize != BLOCK_LARGEST || skip == 0) && super_block_upper_left) {
assert(mbmi->current_q_index > 0);
int reduced_delta_qindex =
(mbmi->current_q_index - xd->prev_qindex) / cm->delta_q_res;
......
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