shithub: libvpx

Info  •  Files  •  Log  •  Branches

Remove decode asserts from better-hw-compatibility

Safer to have the decoder operate normally and have
better-hw-compatibility only implement encoding changes.
Fixes some test failures.

Change-Id: I0dd70d002e4e893992f0cd59774b9363e6f7fe76

--- a/vp9/common/vp9_reconinter.c

+++ b/vp9/common/vp9_reconinter.c

@@ -178,7 +178,7 @@

       // Co-ordinate of containing block to pixel precision.

       const int x_start = (-xd->mb_to_left_edge >> (3 + pd->subsampling_x));

       const int y_start = (-xd->mb_to_top_edge >> (3 + pd->subsampling_y));

-#if CONFIG_BETTER_HW_COMPATIBILITY

+#if 0  // CONFIG_BETTER_HW_COMPATIBILITY

       assert(xd->mi[0]->sb_type != BLOCK_4X8 &&

              xd->mi[0]->sb_type != BLOCK_8X4);

       assert(mv_q4.row == mv.row * (1 << (1 - pd->subsampling_y)) &&

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

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

@@ -589,7 +589,7 @@

     // Co-ordinate of containing block to pixel precision.

     int x_start = (-xd->mb_to_left_edge >> (3 + pd->subsampling_x));

     int y_start = (-xd->mb_to_top_edge >> (3 + pd->subsampling_y));

-#if CONFIG_BETTER_HW_COMPATIBILITY

+#if 0  // CONFIG_BETTER_HW_COMPATIBILITY

     assert(xd->mi[0]->sb_type != BLOCK_4X8 &&

            xd->mi[0]->sb_type != BLOCK_8X4);

     assert(mv_q4.row == mv->row * (1 << (1 - pd->subsampling_y)) &&

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

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

@@ -902,10 +902,10 @@

       frame_mvs += cm->mi_cols;

     }

   }

-#if CONFIG_BETTER_HW_COMPATIBILITY && CONFIG_VP9_HIGHBITDEPTH

-    if ((xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) &&

-        (xd->above_mi == NULL || xd->left_mi == NULL) &&

-        !is_inter_block(mi) && need_top_left[mi->uv_mode])

-      assert(0);

+#if 0  // CONFIG_BETTER_HW_COMPATIBILITY && CONFIG_VP9_HIGHBITDEPTH

+  if ((xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) &&

+      (xd->above_mi == NULL || xd->left_mi == NULL) &&

+      !is_inter_block(mi) && need_top_left[mi->uv_mode])

+    assert(0);

 #endif  // CONFIG_BETTER_HW_COMPATIBILITY && CONFIG_VP9_HIGHBITDEPTH

 }