commit 39b06eb87c8fd06daf00f5d22ea25a99702d2eda
author Angie Chiang <angiebird@google.com> Fri Apr 14 09:52:29 2017 -0700
committer Angie Chiang <angiebird@google.com> Sat Apr 15 18:32:31 2017 +0000
tree b329d8dfc4c0a3e24c051f53f0bd5280729c4dc6
parent de58e49fb5760d4be23f8c6f427f6f212e9db2f1

Add plane to tx_type read/write/update functions

This is for lv_map experiment

Change-Id: Ie000f7850efac32ffb46b9a4679cff2814c6246a

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index e6e88b5..7b2f4c4 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1424,7 +1424,7 @@
                        const int supertx_enabled,
 #endif
 #if CONFIG_LV_MAP
-                       int block,
+                       int block, int plane,
 #endif
                        aom_writer *w) {
   MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
@@ -1444,7 +1444,9 @@
   TX_TYPE tx_type = mbmi->tx_type;
 #else
   // Only y plane's tx_type is transmitted
-  TX_TYPE tx_type = get_tx_type(PLANE_TYPE_Y, xd, block, tx_size);
+  if (plane > 0) return;
+  PLANE_TYPE plane_type = get_plane_type(plane);
+  TX_TYPE tx_type = get_tx_type(plane_type, xd, block, tx_size);
 #endif
 
   if (!FIXED_TX_TYPE) {