commit 68abef8ca42597b3eb5e16335a35379d1577fcd9
author Alex Converse <aconverse@google.com> Thu Mar 23 14:50:33 2017 -0700
committer Alex Converse <aconverse@google.com> Mon Mar 27 16:38:07 2017 +0000
tree cf86b784d3d0dde25fa7f83a8e4bebd58e549b5e
parent 67741e0c52bb67b908350f56b8524ff11ab2c719

deltaq: Use block size / mask macros

Fixes unit tests with ext-partition

Change-Id: I17184c7321e27763eea5434f0d4425d928c0abcc

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index c997068..da0af3b 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -76,7 +76,7 @@
   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;

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 55fdbec..8f9e991 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1602,7 +1602,7 @@
   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 @@
 #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;