commit d1097fc8a5860ddc6f617c57224e58cf8d065d56
author Jingning Han <jingning@google.com> Tue Dec 06 10:55:34 2016 -0800
committer Jingning Han <jingning@google.com> Wed Dec 07 05:47:55 2016 +0000
tree b267cbbb99b1258f41b5f717628ae35318fe367d
parent bfcd1f1a256d95defd27e12abe924f479233b9f1

Make sub8x8 intra mode RD search compatible with cb4x4

The module blocks are now scaled to operate in the unit of 2x2
blocks. This commit makes the sub8x8 intra mode RD search compatible
with such assumption.

Change-Id: If86c87c2ee011a6bc1d2de2cf2d41f270ed2896b

av1/encoder/context_tree.c

diff --git a/av1/encoder/context_tree.c b/av1/encoder/context_tree.c
index a0ab2e6..63b6bed 100644
--- a/av1/encoder/context_tree.c
+++ b/av1/encoder/context_tree.c
@@ -218,9 +218,9 @@
   // context so we only need to allocate 1 for each 8x8 block.
   for (i = 0; i < leaf_nodes; ++i) {
 #if CONFIG_EXT_PARTITION_TYPES
-    alloc_mode_context(cm, 1, PARTITION_NONE, &td->leaf_tree[i]);
+    alloc_mode_context(cm, 4, PARTITION_NONE, &td->leaf_tree[i]);
 #else
-    alloc_mode_context(cm, 1, &td->leaf_tree[i]);
+    alloc_mode_context(cm, 16, &td->leaf_tree[i]);
 #endif
   }
 

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index ecdd04d..32f4623 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2190,7 +2190,7 @@
 
     for (idy = 0; idy < num_4x4_blocks_high; ++idy) {
       for (idx = 0; idx < num_4x4_blocks_wide; ++idx) {
-        const int block = (row + idy) * 2 + (col + idx);
+        int block = (row + idy) * 2 + (col + idx);
         const uint8_t *const src = &src_init[idx * 4 + idy * 4 * src_stride];
         uint8_t *const dst = &dst_init[idx * 4 + idy * 4 * dst_stride];
 #if !CONFIG_PVQ
@@ -2211,8 +2211,13 @@
 #endif
         xd->mi[0]->bmi[block].as_mode = mode;
         av1_predict_intra_block(xd, pd->width, pd->height, TX_4X4, mode, dst,
-                                dst_stride, dst, dst_stride, col + idx,
-                                row + idy, 0);
+                                dst_stride, dst, dst_stride,
+#if CONFIG_CB4X4
+                                2 * (col + idx), 2 * (row + idy),
+#else
+                                col + idx, row + idy,
+#endif
+                                0);
 #if !CONFIG_PVQ
         aom_subtract_block(4, 4, src_diff, 8, src, src_stride, dst, dst_stride);
 #else
@@ -2245,12 +2250,20 @@
           const SCAN_ORDER *scan_order = get_scan(cm, TX_4X4, tx_type, 0);
           const int coeff_ctx =
               combine_entropy_contexts(*(tempa + idx), *(templ + idy));
+#if CONFIG_CB4X4
+          block = 4 * block;
+#endif
 #if CONFIG_NEW_QUANT
           av1_xform_quant(cm, x, 0, block, row + idy, col + idx, BLOCK_8X8,
                           TX_4X4, coeff_ctx, AV1_XFORM_QUANT_B_NUQ);
 #else
-          av1_xform_quant(cm, x, 0, block, row + idy, col + idx, BLOCK_8X8,
-                          TX_4X4, coeff_ctx, AV1_XFORM_QUANT_B);
+          av1_xform_quant(cm, x, 0, block,
+#if CONFIG_CB4X4
+                          2 * (row + idy), 2 * (col + idx),
+#else
+                          row + idy, col + idx,
+#endif
+                          BLOCK_8X8, TX_4X4, coeff_ctx, AV1_XFORM_QUANT_B);
 #endif  // CONFIG_NEW_QUANT
           ratey += av1_cost_coeffs(cm, x, 0, block, coeff_ctx, TX_4X4,
                                    scan_order->scan, scan_order->neighbors,
@@ -2284,12 +2297,20 @@
           const SCAN_ORDER *scan_order = get_scan(cm, TX_4X4, tx_type, 0);
           const int coeff_ctx =
               combine_entropy_contexts(*(tempa + idx), *(templ + idy));
+#if CONFIG_CB4X4
+          block = 4 * block;
+#endif
 #if CONFIG_NEW_QUANT
           av1_xform_quant(cm, x, 0, block, row + idy, col + idx, BLOCK_8X8,
                           TX_4X4, coeff_ctx, AV1_XFORM_QUANT_FP_NUQ);
 #else
-          av1_xform_quant(cm, x, 0, block, row + idy, col + idx, BLOCK_8X8,
-                          TX_4X4, coeff_ctx, AV1_XFORM_QUANT_FP);
+          av1_xform_quant(cm, x, 0, block,
+#if CONFIG_CB4X4
+                          2 * (row + idy), 2 * (col + idx),
+#else
+                          row + idy, col + idx,
+#endif
+                          BLOCK_8X8, TX_4X4, coeff_ctx, AV1_XFORM_QUANT_FP);
 #endif  // CONFIG_NEW_QUANT
           av1_optimize_b(cm, x, 0, block, TX_4X4, coeff_ctx);
           ratey += av1_cost_coeffs(cm, x, 0, block, coeff_ctx, TX_4X4,