ref: 14d91ac515bb06444534ce35f6fefb5f3b925de3
parent: 3271a7ed6c976fd6d25c144c19170bac9b57367b
author: Angie Chiang <angiebird@google.com>
date: Mon Dec 10 10:29:39 EST 2018
Use motion field for mv inconsistency in mv search Change-Id: I25ea05f4bfe3c6f420e967c33763909c979a0d1b
--- a/vp9/encoder/vp9_mcomp.h
+++ b/vp9/encoder/vp9_mcomp.h
@@ -148,6 +148,31 @@
void vp9_prepare_nb_full_mvs(const struct TplDepFrame *tpl_frame, int mi_row,
int mi_col, int rf_idx, BLOCK_SIZE bsize,
int_mv *nb_full_mvs);
+
+static INLINE BLOCK_SIZE get_square_block_size(BLOCK_SIZE bsize) {+ BLOCK_SIZE square_bsize;
+ switch (bsize) {+ case BLOCK_4X4:
+ case BLOCK_4X8:
+ case BLOCK_8X4: square_bsize = BLOCK_4X4; break;
+ case BLOCK_8X8:
+ case BLOCK_8X16:
+ case BLOCK_16X8: square_bsize = BLOCK_8X8; break;
+ case BLOCK_16X16:
+ case BLOCK_16X32:
+ case BLOCK_32X16: square_bsize = BLOCK_16X16; break;
+ case BLOCK_32X32:
+ case BLOCK_32X64:
+ case BLOCK_64X32:
+ case BLOCK_64X64: square_bsize = BLOCK_32X32; break;
+ default:
+ square_bsize = BLOCK_INVALID;
+ printf("ERROR: invlid block size %d\n", bsize);+ assert(0);
+ break;
+ }
+ return square_bsize;
+}
#endif // CONFIG_NON_GREEDY_MV
#ifdef __cplusplus
} // extern "C"
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -2316,59 +2316,20 @@
}
#if CONFIG_NON_GREEDY_MV
-#define MAX_PREV_NB_FULL_MV_NUM 8
-static int find_prev_nb_full_mvs(const VP9_COMMON *cm, const MACROBLOCKD *xd,
- int ref_frame, BLOCK_SIZE bsize, int mi_row,
- int mi_col, int_mv *nb_full_mvs) {- int i;
- const TileInfo *tile = &xd->tile;
- int full_mv_num = 0;
- assert(bsize >= BLOCK_8X8);
- for (i = 0; i < MVREF_NEIGHBOURS; ++i) {- const POSITION *mv_ref = &mv_ref_blocks[bsize][i];
- if (is_inside(tile, mi_col, mi_row, cm->mi_rows, mv_ref)) {- const MODE_INFO *nb_mi =
- xd->mi[mv_ref->col + mv_ref->row * xd->mi_stride];
- if (nb_mi->sb_type >= BLOCK_8X8) {- if (nb_mi->ref_frame[0] == ref_frame) {- nb_full_mvs[full_mv_num].as_mv = get_full_mv(&nb_mi->mv[0].as_mv);
- ++full_mv_num;
- if (full_mv_num >= MAX_PREV_NB_FULL_MV_NUM) {- return full_mv_num;
- }
- } else if (nb_mi->ref_frame[1] == ref_frame) {- nb_full_mvs[full_mv_num].as_mv = get_full_mv(&nb_mi->mv[1].as_mv);
- ++full_mv_num;
- if (full_mv_num >= MAX_PREV_NB_FULL_MV_NUM) {- return full_mv_num;
- }
- }
- } else {- int j;
- for (j = 0; j < 4; ++j) {- // TODO(angiebird): avoid using duplicated mvs
- if (nb_mi->ref_frame[0] == ref_frame) {- nb_full_mvs[full_mv_num].as_mv =
- get_full_mv(&nb_mi->bmi[j].as_mv[0].as_mv);
- ++full_mv_num;
- if (full_mv_num >= MAX_PREV_NB_FULL_MV_NUM) {- return full_mv_num;
- }
- } else if (nb_mi->ref_frame[1] == ref_frame) {- nb_full_mvs[full_mv_num].as_mv =
- get_full_mv(&nb_mi->bmi[j].as_mv[1].as_mv);
- ++full_mv_num;
- if (full_mv_num >= MAX_PREV_NB_FULL_MV_NUM) {- return full_mv_num;
- }
- }
- }
- }
- }
+static int ref_frame_to_gf_rf_idx(int ref_frame) {+ if (ref_frame == GOLDEN_FRAME) {+ return 0;
}
- return full_mv_num;
+ if (ref_frame == LAST_FRAME) {+ return 1;
+ }
+ if (ref_frame == ALTREF_FRAME) {+ return 2;
+ }
+ assert(0);
+ return -1;
}
-#endif // CONFIG_NON_GREEDY_MV
+#endif
static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bsize,
int mi_row, int mi_col, int_mv *tmp_mv,
@@ -2395,10 +2356,13 @@
double mv_cost = 0;
double lambda = (pw * ph) / 4;
double bestsme;
- int_mv nb_full_mvs[MAX_PREV_NB_FULL_MV_NUM];
-
- const int nb_full_mv_num =
- find_prev_nb_full_mvs(cm, xd, ref, bsize, mi_row, mi_col, nb_full_mvs);
+ int_mv nb_full_mvs[NB_MVS_NUM];
+ const int nb_full_mv_num = NB_MVS_NUM;
+ int gf_group_idx = cpi->twopass.gf_group.index;
+ int gf_rf_idx = ref_frame_to_gf_rf_idx(ref);
+ BLOCK_SIZE square_bsize = get_square_block_size(bsize);
+ vp9_prepare_nb_full_mvs(&cpi->tpl_stats[gf_group_idx], mi_row, mi_col,
+ gf_rf_idx, square_bsize, nb_full_mvs);
#else // CONFIG_NON_GREEDY_MV
int bestsme = INT_MAX;
int sadpb = x->sadperbit16;