commit 18d38f6c011c33c95289fc51c2bfcacf99d5151e
author Debargha Mukherjee <debargha@google.com> Thu Nov 17 20:30:16 2016 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Nov 18 23:24:54 2016 +0000
tree 5a7083a45ecd213e4f581e58570d9223c65c8f08
parent 8a78a2b4f4eae1fb03aef3a8f5d415620fe33316

Various table updates to support 64x64 transforms

Includes:
Various table updates and fixes to support 64x64 transforms.
Entropymode updates to support tx_size expansion to 64x64.
tx_mode changes to support an ALLOW_64sXx64 transform mode.

Change-Id: Ib9098cfe27d0c015fe3be6ae13e7d09576771b9e

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 712c00f..2c64880 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3166,9 +3166,17 @@
 }
 #endif
 
-static void write_txfm_mode(TX_MODE mode, struct aom_write_bit_buffer *wb) {
+static void write_tx_mode(TX_MODE mode, struct aom_write_bit_buffer *wb) {
+#if CONFIG_TX64X64
+  aom_wb_write_bit(wb, mode == TX_MODE_SELECT);
+  if (mode != TX_MODE_SELECT) {
+    aom_wb_write_literal(wb, AOMMIN(mode, ALLOW_32X32), 2);
+    if (mode >= ALLOW_32X32) aom_wb_write_bit(wb, mode == ALLOW_64X64);
+  }
+#else
   aom_wb_write_bit(wb, mode == TX_MODE_SELECT);
   if (mode != TX_MODE_SELECT) aom_wb_write_literal(wb, mode, 2);
+#endif  // CONFIG_TX64X64
 }
 
 static void update_txfm_probs(AV1_COMMON *cm, aom_writer *w,
@@ -3949,7 +3957,7 @@
   if (!cm->seg.enabled && xd->lossless[0])
     cm->tx_mode = ONLY_4X4;
   else
-    write_txfm_mode(cm->tx_mode, wb);
+    write_tx_mode(cm->tx_mode, wb);
 
   if (cpi->allow_comp_inter_inter) {
     const int use_hybrid_pred = cm->reference_mode == REFERENCE_MODE_SELECT;