diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-07 16:01:34 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-04-07 16:01:34 -0700 |
| commit | 22a3e30790d141033778e430a47ba7d558237362 (patch) | |
| tree | 7019a30bf642772aed86a8fa4d70d9282f8fba4b /vp9/common | |
| parent | 01aae92dcfb879c7b5a965f40e46f1beec77a30a (diff) | |
| download | libvpx-22a3e30790d141033778e430a47ba7d558237362.tar libvpx-22a3e30790d141033778e430a47ba7d558237362.tar.gz libvpx-22a3e30790d141033778e430a47ba7d558237362.tar.bz2 libvpx-22a3e30790d141033778e430a47ba7d558237362.zip | |
Converting set_prev_mi() to get_prev_mi().
Change-Id: Iad4002d7aecaae0e25d88e286bacde7e6cd7264f
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_mvref_common.c | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vp9/common/vp9_mvref_common.c b/vp9/common/vp9_mvref_common.c index 61682c42d..1aab36205 100644 --- a/vp9/common/vp9_mvref_common.c +++ b/vp9/common/vp9_mvref_common.c @@ -195,7 +195,7 @@ static void find_mv_refs_idx(const VP9_COMMON *cm, const MACROBLOCKD *xd, int block, int mi_row, int mi_col) { const int *ref_sign_bias = cm->ref_frame_sign_bias; int i, refmv_count = 0; - const MODE_INFO *prev_mi = cm->coding_use_prev_mi && cm->prev_mi + const MODE_INFO *prev_mi = cm->prev_mi ? cm->prev_mi_grid_visible[mi_row * xd->mi_stride + mi_col] : NULL; const MB_MODE_INFO *const prev_mbmi = prev_mi ? &prev_mi->mbmi : NULL; diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index ea1b8856e..32dc2d985 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -281,15 +281,15 @@ static INLINE void set_mi_row_col(MACROBLOCKD *xd, const TileInfo *const tile, xd->left_available = (mi_col > tile->mi_col_start); } -static INLINE void set_prev_mi(VP9_COMMON *cm) { - const int use_prev_in_find_mv_refs = cm->width == cm->last_width && - cm->height == cm->last_height && - !cm->intra_only && - cm->last_show_frame; +static INLINE MODE_INFO *get_prev_mi(VP9_COMMON *cm) { + const int use_prev_mi = cm->coding_use_prev_mi && + cm->width == cm->last_width && + cm->height == cm->last_height && + !cm->intra_only && + cm->last_show_frame; // Special case: set prev_mi to NULL when the previous mode info // context cannot be used. - cm->prev_mi = use_prev_in_find_mv_refs ? - cm->prev_mip + cm->mi_stride + 1 : NULL; + return use_prev_mi ? &cm->prev_mip[cm->mi_stride + 1] : NULL; } static INLINE int frame_is_intra_only(const VP9_COMMON *const cm) { |