shithub: libvpx

Info  •  Files  •  Log  •  Branches

Converted assert to error checking

Change-Id: Icb8c677f910f588cc7c97e70f024787fe6789257

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

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

@@ -425,11 +425,12 @@

   mbmi->uv_mode = read_intra_mode_uv(cm, r, mbmi->mode);

 }

-static INLINE void assign_mv(VP9_COMMON *cm, MB_PREDICTION_MODE mode,

+static INLINE int assign_mv(VP9_COMMON *cm, MB_PREDICTION_MODE mode,

                              int_mv mv[2], int_mv best_mv[2],

                              int_mv nearest_mv[2], int_mv near_mv[2],

                              int is_compound, int allow_hp, vp9_reader *r) {

   int i;

+  int ret = 1;

   switch (mode) {

     case NEWMV:

@@ -438,6 +439,10 @@

        if (is_compound)

          read_mv(r, &mv[1].as_mv, &best_mv[1].as_mv,

                  &cm->fc.nmvc, &cm->counts.mv, allow_hp);

+       for (i = 0; i < 1 + is_compound; ++i) {

+         ret = ret && mv[i].as_mv.row < MV_UPP && mv[i].as_mv.row > MV_LOW;

+         ret = ret && mv[i].as_mv.col < MV_UPP && mv[i].as_mv.col > MV_LOW;

+       }

        break;

     case NEARESTMV:

       mv[0].as_int = nearest_mv[0].as_int;

@@ -455,13 +460,9 @@

         mv[1].as_int = 0;

       break;

     default:

-      assert(!"Invalid inter mode value.");

+      return 0;

   }

-

-  for (i = 0; i < 1 + is_compound; ++i) {

-    assert(mv[i].as_mv.row < MV_UPP && mv[i].as_mv.row > MV_LOW);

-    assert(mv[i].as_mv.col < MV_UPP && mv[i].as_mv.col > MV_LOW);

-  }

+  return ret;

 }

 static int read_is_inter_block(VP9D_COMP *pbi, int segment_id, vp9_reader *r) {

@@ -557,9 +558,13 @@

                                           mi_row, mi_col);

         }

-        assign_mv(cm, b_mode, block, best, nearest, nearmv,

-                  is_compound, allow_hp, r);

+        if (!assign_mv(cm, b_mode, block, best, nearest, nearmv,

+                       is_compound, allow_hp, r)) {

+          xd->corrupted |= 1;

+          break;

+        };

+

         mi->bmi[j].as_mv[0].as_int = block[0].as_int;

         if (is_compound)

           mi->bmi[j].as_mv[1].as_int = block[1].as_int;

@@ -576,8 +581,9 @@

     mbmi->mv[0].as_int = mi->bmi[3].as_mv[0].as_int;

     mbmi->mv[1].as_int = mi->bmi[3].as_mv[1].as_int;

   } else {

-    assign_mv(cm, mbmi->mode, mbmi->mv, best, nearest, nearmv,

-              is_compound, allow_hp, r);

+    xd->corrupted |= !assign_mv(cm, mbmi->mode, mbmi->mv,

+                                best, nearest, nearmv,

+                                is_compound, allow_hp, r);

   }

 }