Commit d59d8dc0 authored by Yaowu Xu's avatar Yaowu Xu

misc-fix: merge the fix for duplicate MV check

This commit merges the misc-fix of removing a duplicate check on MV
values.

Related tracking issue:
https://bugs.chromium.org/p/webm/issues/detail?id=662
Original libvpx commit:
43be86db

Change-Id: Ibb1db543c6641dfd74979b927651c53f62088159
parent bf7e741e
......@@ -605,9 +605,6 @@ static void find_mv_refs_idx(const AV1_COMMON *cm, const MACROBLOCKD *xd,
}
if (prev_frame_mvs->ref_frame[1] > INTRA_FRAME &&
#if !CONFIG_MISC_FIXES
prev_frame_mvs->mv[1].as_int != prev_frame_mvs->mv[0].as_int &&
#endif
prev_frame_mvs->ref_frame[1] != ref_frame) {
int_mv mv = prev_frame_mvs->mv[1];
if (ref_sign_bias[prev_frame_mvs->ref_frame[1]] !=
......
......@@ -295,10 +295,7 @@ static INLINE int_mv scale_mv(const MB_MODE_INFO *mbmi, int ref,
if ((mbmi)->ref_frame[0] != ref_frame) \
ADD_MV_REF_LIST(scale_mv((mbmi), 0, ref_frame, ref_sign_bias), \
refmv_count, mv_ref_list, bw, bh, xd, Done); \
if (has_second_ref(mbmi) && \
(CONFIG_MISC_FIXES || \
(mbmi)->mv[1].as_int != (mbmi)->mv[0].as_int) && \
(mbmi)->ref_frame[1] != ref_frame) \
if (has_second_ref(mbmi) && (mbmi)->ref_frame[1] != ref_frame) \
ADD_MV_REF_LIST(scale_mv((mbmi), 1, ref_frame, ref_sign_bias), \
refmv_count, mv_ref_list, bw, bh, xd, Done); \
} \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment