Wrapped asserts in critical code with CONFIG_DEBUG

Change-Id: I5b0aaca06f2e0f40588cb24fb0642b6865da8970

diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index ced96355978a2245b831a95c60a13e001959ebbe..e93d30d1acf35980733a9b90e5e9c274ad8eb55d 100644 (file)
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -776,9 +776,9 @@ static void write_mv_ref
     vp8_writer *w, MB_PREDICTION_MODE m, const vp8_prob *p
 )
 {
-
+#if CONFIG_DEBUG
     assert(NEARESTMV <= m  &&  m <= SPLITMV);
-
+#endif
     vp8_write_token(w, vp8_mv_ref_tree, p,
                     vp8_mv_ref_encoding_array - NEARESTMV + m);
 }
@@ -788,8 +788,9 @@ static void write_sub_mv_ref
     vp8_writer *w, B_PREDICTION_MODE m, const vp8_prob *p
 )
 {
+#if CONFIG_DEBUG
     assert(LEFT4X4 <= m  &&  m <= NEW4X4);
-
+#endif
     vp8_write_token(w, vp8_sub_mv_ref_tree, p,
                     vp8_sub_mv_ref_encoding_array - LEFT4X4 + m);
 }
@@ -1017,11 +1018,13 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
 
                         blockmode =  cpi->mb.partition_info->bmi[j].mode;
                         blockmv =  cpi->mb.partition_info->bmi[j].mv;
-
+#if CONFIG_DEBUG
                         while (j != L[++k])
                             if (k >= 16)
                                 assert(0);
-
+#else
+                        while (j != L[++k]);
+#endif
                         leftmv.as_int = left_block_mv(m, k);
                         abovemv.as_int = above_block_mv(m, k, mis);
                         mv_contz = vp8_mv_cont(&leftmv, &abovemv);

diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c
index 1c5923813843a1fc6467c841f38da710043235ca..21014328022b87f1a36e79b71b6cfe2dc733805a 100644 (file)
--- a/vp8/encoder/tokenize.c
+++ b/vp8/encoder/tokenize.c
@@ -120,9 +120,9 @@ static void tokenize2nd_order_b
         {
             int rc = vp8_default_zig_zag1d[c];
             const int v = qcoeff_ptr[rc];
-
+#if CONFIG_DEBUG
             assert(-DCT_MAX_VALUE <= v  &&  v < (DCT_MAX_VALUE));
-
+#endif
             t->Extra = vp8_dct_value_tokens_ptr[v].Extra;
             x        = vp8_dct_value_tokens_ptr[v].Token;
         }
@@ -173,9 +173,9 @@ static void tokenize1st_order_b
         {
             int rc = vp8_default_zig_zag1d[c];
             const int v = qcoeff_ptr[rc];
-
+#if CONFIG_DEBUG
             assert(-DCT_MAX_VALUE <= v  &&  v < (DCT_MAX_VALUE));
-
+#endif
             t->Extra = vp8_dct_value_tokens_ptr[v].Extra;
             x        = vp8_dct_value_tokens_ptr[v].Token;
         }