Remove ref_frame_side Clear a TODO. Use ref_frame_sign_bias to achieve the same functionality. Change-Id: I07d87bac1a2f15fae8967fcd341d8d8886aed913
diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c index 1605743..382a984 100644 --- a/av1/common/mvref_common.c +++ b/av1/common/mvref_common.c
@@ -54,8 +54,7 @@ for (int idx = 0; idx < 2; ++idx) { MV_REFERENCE_FRAME ref_frame = mi->ref_frame[idx]; if (ref_frame > INTRA_FRAME) { - int8_t ref_idx = cm->ref_frame_side[ref_frame]; - if (ref_idx) continue; + if (cm->ref_frame_sign_bias[ref_frame] == 1) continue; if ((abs(mi->mv[idx].as_mv.row) > REFMVS_LIMIT) || (abs(mi->mv[idx].as_mv.col) > REFMVS_LIMIT)) continue; @@ -993,7 +992,6 @@ } void av1_setup_motion_field(AV1_COMMON *cm) { - memset(cm->ref_frame_side, 0, sizeof(cm->ref_frame_side)); if (!cm->seq_params.enable_order_hint) return; TPL_MV_REF *tpl_mvs_base = cm->tpl_mvs; @@ -1018,11 +1016,6 @@ ref_buf_idx[ref_idx] = buf_idx; ref_order_hint[ref_idx] = order_hint; - - if (get_relative_dist(cm, order_hint, cur_order_hint) > 0) - cm->ref_frame_side[ref_frame] = 1; - else if (order_hint == cur_order_hint) - cm->ref_frame_side[ref_frame] = -1; } int ref_stamp = MFMV_STACK_SIZE - 1;
diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h index 6b1bf2d..bd72a71 100644 --- a/av1/common/onyxc_int.h +++ b/av1/common/onyxc_int.h
@@ -524,8 +524,6 @@ LV_MAP_CTX_TABLE coeff_ctx_table; TPL_MV_REF *tpl_mvs; int tpl_mvs_mem_size; - // TODO(jingning): This can be combined with sign_bias later. - int8_t ref_frame_side[REF_FRAMES]; int is_annexb;