commit 153e1f864129a51e38e2b51985592b2e4e212d9f
author Debargha Mukherjee <debargha@google.com> Thu Nov 17 09:59:14 2016 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Nov 18 02:56:09 2016 +0000
tree da0eb681d3756c0b013aa51d0e0c20de8ed4b8a7
parent acddc0366624c5a95a239991347c9a4b9d44c779

Add default 64x64 scan orders and entropy models

Adds 64x64 default scan orders
Adds 64x64 coefficient entropy models (just copy the 32x32 ones)
Entropy context updates for 64x64 transform
Various misc. changes to support 64x64 transforms

Change-Id: I2c0bc4ba540886dd196e87a78b205407ad3e866b

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index a1ce822..cd9587b 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -1431,7 +1431,7 @@
   // int pvq_dc_quant = OD_MAXI(1,
   //  quant * daala_enc->state.pvq_qm_q4[plane][od_qm_get_index(tx_size, 0)] >>
   //  4);
-  int quant_shift = tx_size == TX_32X32 ? 1 : 0;
+  int quant_shift = get_tx_scale(tx_size);
   // DC quantizer for PVQ
   int pvq_dc_quant = OD_MAXI(1, quant[0] >> quant_shift);
   int tell;