shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9 asserts: fix compile warning"

--- a/vp9/common/vp9_entropy.h

+++ b/vp9/common/vp9_entropy.h

@@ -166,7 +166,7 @@

       left_ec  = !!*(const uint64_t *)l;

       break;

     default:

-      assert(!"Invalid transform size.");

+      assert(0 && "Invalid transform size.");

   }

   return combine_entropy_contexts(above_ec, left_ec);

--- a/vp9/common/vp9_pred_common.h

+++ b/vp9/common/vp9_pred_common.h

@@ -104,7 +104,7 @@

     case TX_32X32:

       return tx_probs->p32x32[ctx];

     default:

-      assert(!"Invalid max_tx_size.");

+      assert(0 && "Invalid max_tx_size.");

       return NULL;

   }

 }

@@ -124,7 +124,7 @@

     case TX_32X32:

       return tx_counts->p32x32[ctx];

     default:

-      assert(!"Invalid max_tx_size.");

+      assert(0 && "Invalid max_tx_size.");

       return NULL;

   }

 }

--- a/vp9/decoder/vp9_decodeframe.c

+++ b/vp9/decoder/vp9_decodeframe.c

@@ -266,7 +266,7 @@

         vp9_idct32x32_add(dqcoeff, dst, stride, eob);

         break;

       default:

-        assert(!"Invalid transform size");

+        assert(0 && "Invalid transform size");

     }

     if (eob == 1) {

@@ -511,7 +511,7 @@

         decode_modes_sb(cm, xd, tile, mi_row + hbs, mi_col + hbs, r, subsize);

         break;

       default:

-        assert(!"Invalid partition type");

+        assert(0 && "Invalid partition type");

     }

   }

--- a/vp9/decoder/vp9_decodemv.c

+++ b/vp9/decoder/vp9_decodemv.c

@@ -308,7 +308,7 @@

       ref_frame[1] = NONE;

     } else {

-      assert(!"Invalid prediction mode.");

+      assert(0 && "Invalid prediction mode.");

     }

   }

 }

--- a/vp9/encoder/vp9_encodemb.c

+++ b/vp9/encoder/vp9_encodemb.c

@@ -471,7 +471,7 @@

       xd->itxm_add(dqcoeff, dst, pd->dst.stride, p->eobs[block]);

       break;

     default:

-      assert(!"Invalid transform size");

+      assert(0 && "Invalid transform size");

   }

 }

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -686,7 +686,7 @@

         t_left[i] = !!*(const uint64_t *)&left[i];

       break;

     default:

-      assert(!"Invalid transform size.");

+      assert(0 && "Invalid transform size.");

   }

 }

@@ -3237,7 +3237,7 @@

             break;

           case NONE:

           case MAX_REF_FRAMES:

-            assert(!"Invalid Reference frame");

+            assert(0 && "Invalid Reference frame");

         }

       }

       if (cpi->mode_skip_mask & ((int64_t)1 << mode_index))

@@ -3891,7 +3891,7 @@

             break;

           case NONE:

           case MAX_REF_FRAMES:

-            assert(!"Invalid Reference frame");

+            assert(0 && "Invalid Reference frame");

         }

       }

       if (cpi->mode_skip_mask & ((int64_t)1 << mode_index))

--- a/vp9/vp9_cx_iface.c

+++ b/vp9/vp9_cx_iface.c

@@ -100,7 +100,7 @@

     case VP8_ALTR_FRAME:

       return VP9_ALT_FLAG;

   }

-  assert(!"Invalid Reference Frame");

+  assert(0 && "Invalid Reference Frame");

   return VP9_LAST_FLAG;

 }