diff options
| author | Hui Su <huisu@google.com> | 2014-10-21 11:04:52 -0700 |
|---|---|---|
| committer | Hui Su <huisu@google.com> | 2014-10-21 15:41:37 -0700 |
| commit | 8947b18fa35d45ab29c97a86da5149baecb62fde (patch) | |
| tree | 786003c74f28d0dcd3ca84da5d2829457be106f7 /vp9/common/vp9_mvref_common.c | |
| parent | 4163da33c2689108d75ddaf9bf9f46612582b727 (diff) | |
| download | libvpx-8947b18fa35d45ab29c97a86da5149baecb62fde.tar libvpx-8947b18fa35d45ab29c97a86da5149baecb62fde.tar.gz libvpx-8947b18fa35d45ab29c97a86da5149baecb62fde.tar.bz2 libvpx-8947b18fa35d45ab29c97a86da5149baecb62fde.zip | |
Move the definition of switchable filter numbers into enum
INTERP_FILTER; Modify the macro ADD_MV_REF_LIST and
IF_DIFF_REF_FRAME_ADD_MV.
Change-Id: Ic36c9eb6ccb8ec324d991f7241e42b40b60b1dcb
Diffstat (limited to 'vp9/common/vp9_mvref_common.c')
| -rw-r--r-- | vp9/common/vp9_mvref_common.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/vp9/common/vp9_mvref_common.c b/vp9/common/vp9_mvref_common.c index 3b34050a8..b310eb44d 100644 --- a/vp9/common/vp9_mvref_common.c +++ b/vp9/common/vp9_mvref_common.c @@ -45,9 +45,11 @@ static void find_mv_refs_idx(const VP9_COMMON *cm, const MACROBLOCKD *xd, different_ref_found = 1; if (candidate->ref_frame[0] == ref_frame) - ADD_MV_REF_LIST(get_sub_block_mv(candidate_mi, 0, mv_ref->col, block)); + ADD_MV_REF_LIST(get_sub_block_mv(candidate_mi, 0, mv_ref->col, block), + refmv_count, mv_ref_list, Done); else if (candidate->ref_frame[1] == ref_frame) - ADD_MV_REF_LIST(get_sub_block_mv(candidate_mi, 1, mv_ref->col, block)); + ADD_MV_REF_LIST(get_sub_block_mv(candidate_mi, 1, mv_ref->col, block), + refmv_count, mv_ref_list, Done); } } @@ -62,18 +64,18 @@ static void find_mv_refs_idx(const VP9_COMMON *cm, const MACROBLOCKD *xd, different_ref_found = 1; if (candidate->ref_frame[0] == ref_frame) - ADD_MV_REF_LIST(candidate->mv[0]); + ADD_MV_REF_LIST(candidate->mv[0], refmv_count, mv_ref_list, Done); else if (candidate->ref_frame[1] == ref_frame) - ADD_MV_REF_LIST(candidate->mv[1]); + ADD_MV_REF_LIST(candidate->mv[1], refmv_count, mv_ref_list, Done); } } // Check the last frame's mode and mv info. if (prev_mbmi) { if (prev_mbmi->ref_frame[0] == ref_frame) - ADD_MV_REF_LIST(prev_mbmi->mv[0]); + ADD_MV_REF_LIST(prev_mbmi->mv[0], refmv_count, mv_ref_list, Done); else if (prev_mbmi->ref_frame[1] == ref_frame) - ADD_MV_REF_LIST(prev_mbmi->mv[1]); + ADD_MV_REF_LIST(prev_mbmi->mv[1], refmv_count, mv_ref_list, Done); } // Since we couldn't find 2 mvs from the same reference frame @@ -87,14 +89,16 @@ static void find_mv_refs_idx(const VP9_COMMON *cm, const MACROBLOCKD *xd, * xd->mi_stride].src_mi->mbmi; // If the candidate is INTRA we don't want to consider its mv. - IF_DIFF_REF_FRAME_ADD_MV(candidate); + IF_DIFF_REF_FRAME_ADD_MV(candidate, ref_frame, ref_sign_bias, + refmv_count, mv_ref_list, Done); } } } // Since we still don't have a candidate we'll try the last frame. if (prev_mbmi) - IF_DIFF_REF_FRAME_ADD_MV(prev_mbmi); + IF_DIFF_REF_FRAME_ADD_MV(prev_mbmi, ref_frame, ref_sign_bias, refmv_count, + mv_ref_list, Done); Done: |