generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Converting set_prev_mi() to get_prev_mi()."

Browse Source
This commit is contained in:
Dmitry Kovalev 2014-04-09 10:27:05 -07:00 committed by Gerrit Code Review
commit 5ed83c3220
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vp9/common/vp9_mvref_common.c
View File

@ -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;

14
vp9/common/vp9_onyxc_int.h
View File

@ -284,15 +284,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) {

6
vp9/decoder/vp9_decodeframe.c
View File

@ -1296,11 +1296,7 @@ int vp9_decode_frame(VP9Decoder *pbi,
}
init_macroblockd(cm, &pbi->mb);
if (cm->coding_use_prev_mi)
set_prev_mi(cm);
else
cm->prev_mi = NULL;
cm->prev_mi = get_prev_mi(cm);
setup_plane_dequants(cm, xd, cm->base_qindex);
vp9_setup_block_planes(xd, cm->subsampling_x, cm->subsampling_y);

2
vp9/encoder/vp9_encodeframe.c
View File

@ -3267,7 +3267,7 @@ static void encode_frame_internal(VP9_COMP *cpi) {
if (cpi->oxcf.tuning == VP8_TUNE_SSIM)
build_activity_map(cpi);
set_prev_mi(cm);
cm->prev_mi = get_prev_mi(cm);
if (sf->use_nonrd_pick_mode) {
// Initialize internal buffer pointers for rtc coding, where non-RD