Some tweaks to probabilities for ext-tx with dst1

derflr: up to 1.429% from a little less than 1.3% when
--enable-dst1 is also enabled with --enable-ext-tx.

Change-Id: I301229f2239b18acb96accc4fc44b64fa6927ace
This commit is contained in:
Debargha Mukherjee 2015-08-12 14:31:31 -07:00
parent d5eaca7fee
commit 4525961d80

View File

@ -438,19 +438,19 @@ const vp9_tree_index vp9_ext_tx_tree[TREE_SIZE(EXT_TX_TYPES)] = {
#if CONFIG_WAVELETS
static const vp9_prob default_ext_tx_prob[TX_SIZES][EXT_TX_TYPES - 1] = {
{ 240, 32, 128, 128, 128, 128, 128, 128, 128 },
{ 208, 32, 128, 128, 128, 128, 128, 128, 128 },
{ 176, 32, 128, 128, 128, 128, 128, 128, 128 },
{ 160, 32, 128, 128, 128, 128, 128, 128, 128 },
{ 224, 28, 128, 128, 128, 128, 128, 128, 128 },
{ 200, 28, 128, 128, 128, 128, 128, 128, 128 },
{ 176, 28, 128, 128, 128, 128, 128, 128, 128 },
{ 160, 28, 128, 128, 128, 128, 128, 128, 128 },
#if CONFIG_TX64X64
{ 160, 32, 128, 128, 128, 128, 128, 128, 128 },
{ 160, 28, 128, 128, 128, 128, 128, 128, 128 },
#endif // CONFIG_TX64X64
};
#else
static const vp9_prob default_ext_tx_prob[3][EXT_TX_TYPES - 1] = {
{ 240, 32, 128, 128, 128, 128, 128, 128, 128 },
{ 208, 32, 128, 128, 128, 128, 128, 128, 128 },
{ 176, 32, 128, 128, 128, 128, 128, 128, 128 },
{ 224, 28, 128, 128, 128, 128, 128, 128, 128 },
{ 200, 28, 128, 128, 128, 128, 128, 128, 128 },
{ 176, 28, 128, 128, 128, 128, 128, 128, 128 },
};
#endif // CONFIG_WAVELETS
@ -472,7 +472,7 @@ static const vp9_prob default_ext_tx_prob[TX_SIZES][EXT_TX_TYPES - 1] = {
{ 240, 128, 128, 128, 128, 128, 128, 128 },
{ 208, 128, 128, 128, 128, 128, 128, 128 },
{ 176, 128, 128, 128, 128, 128, 128, 128 },
{ 160, 128, 128, 128, 128, 128, 128, 128 },
{ 168, 128, 128, 128, 128, 128, 128, 128 },
#if CONFIG_TX64X64
{ 160, 128, 128, 128, 128, 128, 128, 128 },
#endif // CONFIG_TX64X64