Commit 932cf697 authored by Debargha Mukherjee's avatar Debargha Mukherjee
Browse files

Fix bugs introduced in a previous patch

Introduced in I2c0bc4ba540886dd196e87a78b205407ad3e866b

Change-Id: I9ff49e7d37c5a1fea8dc8b5659a53697f76320df
parent 3eb1f070
...@@ -814,7 +814,7 @@ static INLINE int txfm_partition_context(TXFM_CONTEXT *above_ctx, ...@@ -814,7 +814,7 @@ static INLINE int txfm_partition_context(TXFM_CONTEXT *above_ctx,
if (max_tx_size >= TX_8X8) { if (max_tx_size >= TX_8X8) {
category = (tx_size != max_tx_size && max_tx_size > TX_8X8) + category = (tx_size != max_tx_size && max_tx_size > TX_8X8) +
(TX_SIZES - 1 - tx_size) * 2; (TX_SIZES - 1 - max_tx_size) * 2;
} }
if (category == TXFM_PARTITION_CONTEXTS - 1) return category; if (category == TXFM_PARTITION_CONTEXTS - 1) return category;
return category * 3 + above + left; return category * 3 + above + left;
......
...@@ -577,8 +577,8 @@ static void get_entropy_contexts_plane( ...@@ -577,8 +577,8 @@ static void get_entropy_contexts_plane(
t_above[i] = t_above[i] =
!!(*(const uint64_t *)&above[i] | *(const uint64_t *)&above[i + 8]); !!(*(const uint64_t *)&above[i] | *(const uint64_t *)&above[i + 8]);
for (i = 0; i < num_4x4_h; i += 16) for (i = 0; i < num_4x4_h; i += 16)
t_left[i] = !!(*(const uint64_t *)&left[i] | t_left[i] =
*(const uint64_t *)&left[i + 8]; !!(*(const uint64_t *)&left[i] | *(const uint64_t *)&left[i + 8]);
break; break;
#endif // CONFIG_TX64X64 #endif // CONFIG_TX64X64
case TX_4X8: case TX_4X8:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment