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

Merge "Merge set_prev_mi function into encoder function."

Browse Source
This commit is contained in:
hkuang
2014-12-05 15:12:50 -08:00
committed by Gerrit Code Review
parent 6ae829088f 62de07c8c6
commit eaa6deee5b
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vp9/common/vp9_onyxc_int.h
View File

@@ -311,17 +311,6 @@ static INLINE void set_mi_row_col(MACROBLOCKD *xd, const TileInfo *const tile,
xd->left_available = (mi_col > tile->mi_col_start); 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;
// 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;
}
static INLINE void update_partition_context(MACROBLOCKD *xd, static INLINE void update_partition_context(MACROBLOCKD *xd,
int mi_row, int mi_col, int mi_row, int mi_col,
BLOCK_SIZE subsize, BLOCK_SIZE subsize,

5
vp9/encoder/vp9_encodeframe.c
View File

@@ -3641,12 +3641,15 @@ static void encode_frame_internal(VP9_COMP *cpi) {
vp9_initialize_rd_consts(cpi); vp9_initialize_rd_consts(cpi);
vp9_initialize_me_consts(cpi, cm->base_qindex); vp9_initialize_me_consts(cpi, cm->base_qindex);
init_encode_frame_mb_context(cpi); init_encode_frame_mb_context(cpi);
set_prev_mi(cm);
cm->use_prev_frame_mvs = !cm->error_resilient_mode && cm->use_prev_frame_mvs = !cm->error_resilient_mode &&
cm->width == cm->last_width && cm->width == cm->last_width &&
cm->height == cm->last_height && cm->height == cm->last_height &&
!cm->intra_only && !cm->intra_only &&
cm->last_show_frame; cm->last_show_frame;
// Special case: set prev_mi to NULL when the previous mode info
// context cannot be used.
cm->prev_mi = cm->use_prev_frame_mvs ?
cm->prev_mip + cm->mi_stride + 1 : NULL;
x->quant_fp = cpi->sf.use_quant_fp; x->quant_fp = cpi->sf.use_quant_fp;
vp9_zero(x->skip_txfm); vp9_zero(x->skip_txfm);