summaryrefslogtreecommitdiff
path: root/vp9/common/vp9_findnearmv.c
diff options
context:
space:
mode:
authorScott LaVarnway <slavarnway@google.com>2013-05-29 16:42:23 -0400
committerScott LaVarnway <slavarnway@google.com>2013-05-29 16:42:23 -0400
commit353642bc53de23e3e51940960c8c2b8f6602566e (patch)
tree768bae6d44becc349a024b57b631d952b79ebe5b /vp9/common/vp9_findnearmv.c
parent9a27b627b8f24bab9c802533b8a01ee0470df9ce (diff)
downloadlibvpx-353642bc53de23e3e51940960c8c2b8f6602566e.tar
libvpx-353642bc53de23e3e51940960c8c2b8f6602566e.tar.gz
libvpx-353642bc53de23e3e51940960c8c2b8f6602566e.tar.bz2
libvpx-353642bc53de23e3e51940960c8c2b8f6602566e.zip
Moved use_prev_in_find_mv_refs check to frame level
This patch checks at the frame level to see if the previous mode info context can be used. This patch eliminates the flag check that was done for every mode and removes another check that was done prior to every vp9_find_mv_refs(). Change-Id: I9da5e18b7e7e28f8b1f90d527cad087073df2d73
Diffstat (limited to 'vp9/common/vp9_findnearmv.c')
-rw-r--r--vp9/common/vp9_findnearmv.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/vp9/common/vp9_findnearmv.c b/vp9/common/vp9_findnearmv.c
index 5e14a8c43..435dfdca6 100644
--- a/vp9/common/vp9_findnearmv.c
+++ b/vp9/common/vp9_findnearmv.c
@@ -61,18 +61,12 @@ void vp9_append_sub8x8_mvs_for_idx(VP9_COMMON *cm, MACROBLOCKD *xd,
int_mv mv_list[MAX_MV_REF_CANDIDATES];
MODE_INFO *mi = xd->mode_info_context;
MB_MODE_INFO *const mbmi = &mi->mbmi;
- int use_prev_in_find_mv_refs;
assert(ref_idx == 0 || ref_idx == 1);
assert(MAX_MV_REF_CANDIDATES == 2); // makes code here slightly easier
- use_prev_in_find_mv_refs = cm->width == cm->last_width &&
- cm->height == cm->last_height &&
- !cm->error_resilient_mode &&
- cm->last_show_frame;
vp9_find_mv_refs_idx(cm, xd, xd->mode_info_context,
- use_prev_in_find_mv_refs ?
- xd->prev_mode_info_context : NULL,
+ xd->prev_mode_info_context,
ref_idx ? mbmi->second_ref_frame : mbmi->ref_frame,
mv_list, cm->ref_frame_sign_bias, block_idx);