Tx64x64 bug fixes

Change-Id: Iac595a3ae8f1466d8485c3627219b4b623efc8ad

diff --git a/vp9/common/vp9_common_data.c b/vp9/common/vp9_common_data.c
index 2a06301447047648ecd1745edb2a9d930001bb70..80377998c474b2e0b8cc5608da2426fa4367c94b 100644 (file)
--- a/vp9/common/vp9_common_data.c
+++ b/vp9/common/vp9_common_data.c
@@ -115,7 +115,7 @@ const BLOCK_SIZE txsize_to_bsize[TX_SIZES] = {
     BLOCK_16X16,  // TX_16X16
     BLOCK_32X32,  // TX_32X32
 #if CONFIG_TX64X64
-    BLOCK_32X32,  // TX_64X64
+    BLOCK_64X64,  // TX_64X64
 #endif
 };
 

diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c
index 7a41a5945a89deade12cf641c17fcef8fe729474..85cc17148f38342b8d61aad43671a3047a63a90e 100644 (file)
--- a/vp9/common/vp9_entropy.c
+++ b/vp9/common/vp9_entropy.c
@@ -21,7 +21,7 @@ const vp9_prob vp9_cat3_prob[] = { 173, 148, 140 };
 const vp9_prob vp9_cat4_prob[] = { 176, 155, 140, 135 };
 const vp9_prob vp9_cat5_prob[] = { 180, 157, 141, 134, 130 };
 const vp9_prob vp9_cat6_prob[] = {
-#if TX_64X64
+#if CONFIG_TX64X64
     255,
 #endif
     254, 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129
@@ -34,7 +34,7 @@ const vp9_prob vp9_cat3_prob_high10[] = { 173, 148, 140 };
 const vp9_prob vp9_cat4_prob_high10[] = { 176, 155, 140, 135 };
 const vp9_prob vp9_cat5_prob_high10[] = { 180, 157, 141, 134, 130 };
 const vp9_prob vp9_cat6_prob_high10[] = {
-#if TX_64X64
+#if CONFIG_TX64X64
     255,
 #endif
     255, 255, 254, 254, 254, 252, 249, 243,
@@ -47,7 +47,7 @@ const vp9_prob vp9_cat3_prob_high12[] = { 173, 148, 140 };
 const vp9_prob vp9_cat4_prob_high12[] = { 176, 155, 140, 135 };
 const vp9_prob vp9_cat5_prob_high12[] = { 180, 157, 141, 134, 130 };
 const vp9_prob vp9_cat6_prob_high12[] = {
-#if TX_64X64
+#if CONFIG_TX64X64
     255,
 #endif
     255, 255, 255, 255, 254, 254, 254, 252, 249,