Add missing mv compliance check when skip mode is used
Harmonize mv setting (remove skip particular case), this allows to always
call is_valid_mv.
Change-Id: Idf9c796d43e01e5afb2240ce60deaa356fd15bdb
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 1cf1ac3..d546936 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1350,11 +1350,9 @@
}
}
- if (mbmi->skip_mode) {
- assert(mbmi->mode == NEAREST_NEARESTMV);
- mbmi->mv[0].as_int = nearestmv[0].as_int;
- mbmi->mv[1].as_int = nearestmv[1].as_int;
- } else {
+ if (mbmi->skip_mode) assert(mbmi->mode == NEAREST_NEARESTMV);
+
+ {
int mv_corrupted_flag =
!assign_mv(cm, xd, mbmi->mode, mbmi->ref_frame, mbmi->mv, ref_mv,
nearestmv, nearmv, mi_row, mi_col, is_compound, allow_hp, r);