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/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 3018b79..f22f744 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -744,7 +744,7 @@
                       int supertx_enabled,
 #endif
 #if CONFIG_LV_MAP
-                      int block,
+                      int block, int plane,
 #endif
                       aom_reader *r) {
   MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
@@ -763,6 +763,8 @@
 #if !CONFIG_LV_MAP
   TX_TYPE *tx_type = &mbmi->tx_type;
 #else
+  // only y plane's tx_type is transmitted
+  if (plane > 0) return;
   TX_TYPE *tx_type = &mbmi->txk_type[block];
 #endif
 

av1/decoder/decodemv.h

diff --git a/av1/decoder/decodemv.h b/av1/decoder/decodemv.h
index 0d751b2..35d471b 100644
--- a/av1/decoder/decodemv.h
+++ b/av1/decoder/decodemv.h
@@ -37,7 +37,7 @@
                       int supertx_enabled,
 #endif
 #if CONFIG_LV_MAP
-                      int block,
+                      int block, int plane,
 #endif
                       aom_reader *r);
 

av1/decoder/decodetxb.c

diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c
index e658493..c283736 100644
--- a/av1/decoder/decodetxb.c
+++ b/av1/decoder/decodetxb.c
@@ -76,7 +76,7 @@
     return 0;
   }
 
-  av1_read_tx_type(cm, xd, block, r);
+  av1_read_tx_type(cm, xd, block, plane, r);
   TX_TYPE tx_type = get_tx_type(plane_type, xd, block, tx_size);
   const SCAN_ORDER *const scan_order =
       get_scan(cm, tx_size, tx_type, is_inter_block(mbmi));