commit d65708a375e4799f50000b0d424e27587d13eb65
author Debargha Mukherjee <debargha@google.com> Thu Nov 03 19:59:09 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 03 19:59:10 2016 +0000
tree 63cae094783b558d7e09819b381efc43940e8e56
parent a504e77a987ceaaccfc2de6feee1806fa4ad557e
parent e04fdb23084a6f46152eb062b60a248a1b605094

Merge "Replace hard coded numbers with TX_SIZES macro" into nextgenv2

av1/common/thread_common.c

diff --git a/av1/common/thread_common.c b/av1/common/thread_common.c
index 541db1d..5aa9198 100644
--- a/av1/common/thread_common.c
+++ b/av1/common/thread_common.c
@@ -528,7 +528,9 @@
   for (i = 0; i < n_counts; i++) acc[i] += cnt[i];
 
 #if CONFIG_DELTA_Q
-  for (i = 0; i < DELTA_Q_CONTEXTS; i++)
+  for (i = 0; i < DELTA_Q_CONTEXTS; i++) {
+    int j;
     for (j = 0; j < 2; ++j) cm->counts.delta_q[i][j] += counts->delta_q[i][j];
+  }
 #endif
 }

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index b844594..0c155e0 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -1114,7 +1114,7 @@
 
 #if CONFIG_DELTA_Q
   if (cpi->oxcf.aq_mode > NO_AQ && cpi->oxcf.aq_mode < DELTA_AQ)
-    av1_init_plane_quantizers(cpi, x);
+    av1_init_plane_quantizers(cpi, x, xd->mi[0]->mbmi.segment_id);
 #else
   if (cpi->oxcf.aq_mode)
     av1_init_plane_quantizers(cpi, x, xd->mi[0]->mbmi.segment_id);
@@ -1797,7 +1797,8 @@
 }
 #endif
 
-static void update_stats(const AV1_COMMON *const cm, ThreadData *td
+static void update_stats(const AV1_COMMON *const cm, ThreadData *td, int mi_row,
+                         int mi_col
 #if CONFIG_SUPERTX
                          ,
                          int supertx_enabled
@@ -1830,6 +1831,9 @@
     if (absdq < DELTA_Q_SMALL) td->counts->delta_q[absdq][0]++;
     xd->prev_qindex = mbmi->current_q_index;
   }
+#else
+  (void)mi_row;
+  (void)mi_col;
 #endif
   if (!frame_is_intra_only(cm)) {
     FRAME_COUNTS *const counts = td->counts;
@@ -2147,9 +2151,9 @@
 
   if (!dry_run) {
 #if CONFIG_SUPERTX
-    update_stats(&cpi->common, td, 0);
+    update_stats(&cpi->common, td, mi_row, mi_col, 0);
 #else
-    update_stats(&cpi->common, td);
+    update_stats(&cpi->common, td, mi_row, mi_col);
 #endif
   }
 }
@@ -4240,7 +4244,7 @@
       set_offsets(cpi, tile_info, x, mi_row, mi_col, BLOCK_64X64);
       xd->mi[0]->mbmi.current_q_index = current_qindex;
       xd->mi[0]->mbmi.segment_id = 0;
-      av1_init_plane_quantizers(cpi, x);
+      av1_init_plane_quantizers(cpi, x, xd->mi[0]->mbmi.segment_id);
     }
 #endif
 
@@ -5565,7 +5569,13 @@
 #endif  // CONFIG_EXT_INTER
                      mi_row_pred, mi_col_pred, bsize_pred, b_sub8x8, block);
 
-  if (!dry_run && !bextend) update_stats(&cpi->common, td, 1);
+  if (!dry_run && !bextend) {
+#if CONFIG_SUPERTX
+    update_stats(&cpi->common, td, mi_row_pred, mi_col_pred, 1);
+#else
+    update_stats(&cpi->common, td, mi_row_pred, mi_col_pred);
+#endif
+  }
 }
 
 static void extend_dir(const AV1_COMP *const cpi, ThreadData *td,

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 4922d61..3dfa2ee 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -3013,8 +3013,8 @@
     inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param);
 #endif  // CONFIG_AOM_HIGHBITDEPTH
 
-    if (txb_h + blk_col > max_blocks_wide ||
-        txb_w + blk_row > max_blocks_high) {
+    if (txb_w + blk_col > max_blocks_wide ||
+        txb_h + blk_row > max_blocks_high) {
       int idx, idy;
       unsigned int this_dist;
       int blocks_height = AOMMIN(txb_h, max_blocks_high - blk_row);

configure

diff --git a/configure b/configure
index 3258ee3..9505b05 100755
--- a/configure
+++ b/configure
@@ -294,6 +294,7 @@
     tile_groups
     ec_adapt
     simp_mv_pred
+    rd_debug
 "
 CONFIG_LIST="
     dependency_tracking