commit 949097c362a22a3adb2322774d0ceca201e18006
author Debargha Mukherjee <debargha@google.com> Tue Nov 15 17:27:38 2016 -0800
committer Debargha Mukherjee <debargha@google.com> Wed Nov 16 04:49:18 2016 +0000
tree 030432f456a23e6bfcd7dbc4174e12a44072648a
parent faa7fcfe1c8fe70f51fa5d00f7b61236b238dde9

Compile fix for var-tx, ext-tx, rect-tx

Change-Id: I8f48db56e3f55b1d2fcc8a06aaa51e5c383e651f

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 848f73d..48036d6 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1298,7 +1298,7 @@
       }
 
       if (is_rect_tx(mbmi->tx_size)) {
-        set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, xd);
+        set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, skip, xd);
       } else {
 #endif  // CONFIG_EXT_TX && CONFIG_RECT_TX
         for (idy = 0; idy < height; idy += bh)
@@ -3971,12 +3971,10 @@
                   &global_motion_types_encodings[type]);
   switch (type) {
     case HOMOGRAPHY:
-        aom_write_primitive_symmetric(
-            w, (params->wmmat[6] >> GM_ROW3HOMO_PREC_DIFF),
-            GM_ABS_ROW3HOMO_BITS);
-        aom_write_primitive_symmetric(
-            w, (params->wmmat[7] >> GM_ROW3HOMO_PREC_DIFF),
-            GM_ABS_ROW3HOMO_BITS);
+      aom_write_primitive_symmetric(
+          w, (params->wmmat[6] >> GM_ROW3HOMO_PREC_DIFF), GM_ABS_ROW3HOMO_BITS);
+      aom_write_primitive_symmetric(
+          w, (params->wmmat[7] >> GM_ROW3HOMO_PREC_DIFF), GM_ABS_ROW3HOMO_BITS);
     // fallthrough intended
     case AFFINE:
     case ROTZOOM:

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 3d2b210..f828653 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5473,7 +5473,8 @@
       !(mbmi->skip || seg_skip)) {
 #if CONFIG_EXT_TX && CONFIG_RECT_TX
     if (is_rect_tx(mbmi->tx_size)) {
-      set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, xd);
+      set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, (mbmi->skip || seg_skip),
+                    xd);
     } else {
       if (dry_run) tx_partition_set_contexts(cm, xd, bsize, mi_row, mi_col);
     }