Clean up unneeded ref mv search funcation calls
Remove unneeded reference motion vector search function calls.
This does not change the coding stats.
Change-Id: Idbd43634f714e2f18d6e5f0a187721ed8ea35d52
diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index e7fe0e3..0f3bf06 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -1459,7 +1459,7 @@
zeromv1,
#endif // USE_CUR_GM_REFMV
mi_row, mi_col, mode_context, compound_search);
-
+#if !CONFIG_OPT_REF_MV
zeromv1[0].as_int = zeromv[0].as_int;
zeromv1[1].as_int = 0;
setup_ref_mv_list(cm, xd, rf[0], ref_mv_count, ref_mv_stack, mv_ref_list,
@@ -1475,6 +1475,7 @@
zeromv1,
#endif // USE_CUR_GM_REFMV
mi_row, mi_col, mode_context, compound_search);
+#endif
} else {
setup_ref_mv_list(cm, xd, ref_frame, ref_mv_count, ref_mv_stack,
mv_ref_list,
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 2c62bc3..1cca02b 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1729,16 +1729,7 @@
MV_REFERENCE_FRAME ref_frame = av1_ref_frame_type(mbmi->ref_frame);
av1_find_mv_refs(cm, xd, mi, ref_frame, xd->ref_mv_count, xd->ref_mv_stack,
compound_inter_mode_ctx, ref_mvs, mi_row, mi_col, fpm_sync,
- (void *)pbi, inter_mode_ctx, 0);
- if (xd->ref_mv_count[ref_frame] <= 1) {
- for (int ref = 0; ref < 1 + is_compound; ++ref) {
- MV_REFERENCE_FRAME frame = mbmi->ref_frame[ref];
-
- av1_find_mv_refs(cm, xd, mi, frame, xd->ref_mv_count, xd->ref_mv_stack,
- compound_inter_mode_ctx, ref_mvs, mi_row, mi_col,
- fpm_sync, (void *)pbi, inter_mode_ctx, 0);
- }
- }
+ (void *)pbi, inter_mode_ctx, 1);
} else {
MV_REFERENCE_FRAME frame = mbmi->ref_frame[0];
av1_find_mv_refs(cm, xd, mi, frame, xd->ref_mv_count, xd->ref_mv_stack,
