Commit 2af277a4 authored by Jingning Han's avatar Jingning Han Committed by Yaowu Xu

Silent clang warnings on variable init value assignment

Clear the clang warnings when var-tx is enabled.

Change-Id: I6b005124159b0607ec3284cc2e5ba287745a2541
parent 9ef435ac
......@@ -1412,9 +1412,6 @@ static void get_filter_level_and_masks_non420(
const int skip_border_4x4_r =
ss_y && mi_row + idx_r >= cm->mi_rows - mi_size_high[BLOCK_8X8];
TX_SIZE tx_size_c = txsize_horz_map[tx_size];
TX_SIZE tx_size_r = txsize_vert_map[tx_size];
int tx_size_mask = 0;
const int c_step = (c >> ss_x);
const int r_step = (r >> ss_y);
......@@ -1436,12 +1433,15 @@ static void get_filter_level_and_masks_non420(
#endif
#if CONFIG_VAR_TX
tx_size_r = AOMMIN(tx_size, cm->above_txfm_context[mi_col + c]);
tx_size_c =
TX_SIZE tx_size_r = AOMMIN(tx_size, cm->above_txfm_context[mi_col + c]);
TX_SIZE tx_size_c =
AOMMIN(tx_size, cm->left_txfm_context[(mi_row + r) & MAX_MIB_MASK]);
cm->above_txfm_context[mi_col + c] = tx_size;
cm->left_txfm_context[(mi_row + r) & MAX_MIB_MASK] = tx_size;
#else
TX_SIZE tx_size_c = txsize_horz_map[tx_size];
TX_SIZE tx_size_r = txsize_vert_map[tx_size];
#endif // CONFIG_VAR_TX
if (tx_size_c == TX_32X32)
......
......@@ -939,7 +939,7 @@ static INLINE int txfm_partition_context(TXFM_CONTEXT *above_ctx,
case 32: max_tx_size = TX_32X32; break;
case 16: max_tx_size = TX_16X16; break;
case 8: max_tx_size = TX_8X8; break;
default: assert(0);
default: assert(max_tx_size == max_txsize_lookup[bsize]); assert(0);
}
if (max_tx_size >= TX_8X8) {
......
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