Inter UV blocks use the same transform type as Y

Extend the ext_tx experiment to make the UV inter blocks use
the same transform type as the extended transform type used
for Y.

derflr: +1.792% (about +0.06)

Change-Id: I4a77e1f7764b2e8b523e28f42ba13559dde4f0ca

diff --git a/vp10/common/blockd.h b/vp10/common/blockd.h
index ce4bd39269f764b40af9147a8cf4ac1a098643c5..bdf09d69bf552bc33d2f3eced9535de2f3a15ff3 100644 (file)
--- a/vp10/common/blockd.h
+++ b/vp10/common/blockd.h
@@ -266,11 +266,7 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type,
   if (xd->lossless || tx_size >= TX_32X32)
     return DCT_DCT;
   if (is_inter_block(&mi->mbmi)) {
-    if (plane_type == PLANE_TYPE_Y) {
-      return ext_tx_to_txtype[mi->mbmi.ext_txfrm];
-    } else {
-      return DCT_DCT;
-    }
+    return ext_tx_to_txtype[mi->mbmi.ext_txfrm];
   }
   return intra_mode_to_tx_type_lookup[plane_type == PLANE_TYPE_Y ?
       get_y_mode(mi, block_idx) : mbmi->uv_mode];

diff --git a/vp10/common/entropymode.c b/vp10/common/entropymode.c
index b8c735058c3a64cede3e27ab42f08d5d49bd8d7c..a194c1478f221ea17352786a866841183dcf083e 100644 (file)
--- a/vp10/common/entropymode.c
+++ b/vp10/common/entropymode.c
@@ -334,9 +334,9 @@ const vpx_tree_index vp10_ext_tx_tree[TREE_SIZE(EXT_TX_TYPES)] = {
 };
 
 static const vpx_prob default_ext_tx_prob[EXT_TX_SIZES][EXT_TX_TYPES - 1] = {
-  { 160, 20, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
   { 144, 20, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
   { 128, 20, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
+  { 112, 20, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
 };
 #endif  // CONFIG_EXT_TX