commit 2af277a442e40cf5c968df298b83525a37dde65f
author Jingning Han <jingning@google.com> Fri May 19 14:01:03 2017 -0700
committer Yaowu Xu <yaowu@google.com> Sun May 21 22:33:13 2017 +0000
tree c4a54350859faf85e69999b6fb18fe1941415366
parent 9ef435ac327c58eac4f42584b252da0ecd37a0f0

Silent clang warnings on variable init value assignment

Clear the clang warnings when var-tx is enabled.

Change-Id: I6b005124159b0607ec3284cc2e5ba287745a2541

av1/common/av1_loopfilter.c

diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c
index d218008..aeb46ab 100644
--- a/av1/common/av1_loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -1412,9 +1412,6 @@
     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 @@
 #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)

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 7c993f8..1689666 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -939,7 +939,7 @@
     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) {