Commit 2fac8a41 authored by Jingning Han's avatar Jingning Han
Browse files

Deprecate the use of bmi structure from av1 codec

Change-Id: I7f5010ae3b9a014b3dca0425c9eada3b9e2c0ab3
parent 909e0f60
...@@ -359,10 +359,7 @@ typedef struct MB_MODE_INFO { ...@@ -359,10 +359,7 @@ typedef struct MB_MODE_INFO {
#endif #endif
} MB_MODE_INFO; } MB_MODE_INFO;
typedef struct MODE_INFO { typedef struct MODE_INFO { MB_MODE_INFO mbmi; } MODE_INFO;
MB_MODE_INFO mbmi;
b_mode_info bmi[4];
} MODE_INFO;
#if CONFIG_INTRABC #if CONFIG_INTRABC
#define NO_FILTER_FOR_IBC 1 // Disable in-loop filters for frame with intrabc #define NO_FILTER_FOR_IBC 1 // Disable in-loop filters for frame with intrabc
......
...@@ -1775,11 +1775,7 @@ static void dump_mode_info(MODE_INFO *mi) { ...@@ -1775,11 +1775,7 @@ static void dump_mode_info(MODE_INFO *mi) {
printf("&& mi->mbmi.mi_col == %d\n", mi->mbmi.mi_col); printf("&& mi->mbmi.mi_col == %d\n", mi->mbmi.mi_col);
printf("&& mi->mbmi.sb_type == %d\n", mi->mbmi.sb_type); printf("&& mi->mbmi.sb_type == %d\n", mi->mbmi.sb_type);
printf("&& mi->mbmi.tx_size == %d\n", mi->mbmi.tx_size); printf("&& mi->mbmi.tx_size == %d\n", mi->mbmi.tx_size);
if (mi->mbmi.sb_type >= BLOCK_8X8) { printf("&& mi->mbmi.mode == %d\n", mi->mbmi.mode);
printf("&& mi->mbmi.mode == %d\n", mi->mbmi.mode);
} else {
printf("&& mi->bmi[0].as_mode == %d\n", mi->bmi[0].as_mode);
}
} }
static int rd_token_stats_mismatch(RD_STATS *rd_stats, TOKEN_STATS *token_stats, static int rd_token_stats_mismatch(RD_STATS *rd_stats, TOKEN_STATS *token_stats,
int plane) { int plane) {
......
...@@ -7458,7 +7458,6 @@ static int64_t handle_newmv(const AV1_COMP *const cpi, MACROBLOCK *const x, ...@@ -7458,7 +7458,6 @@ static int64_t handle_newmv(const AV1_COMP *const cpi, MACROBLOCK *const x,
if (x->best_mv.as_int == INVALID_MV) return INT64_MAX; if (x->best_mv.as_int == INVALID_MV) return INT64_MAX;
frame_mv[refs[0]] = x->best_mv; frame_mv[refs[0]] = x->best_mv;
xd->mi[0]->bmi[0].as_mv[0] = x->best_mv;
// Estimate the rate implications of a new mv but discount this // Estimate the rate implications of a new mv but discount this
// under certain circumstances where we want to help initiate a weak // under certain circumstances where we want to help initiate a weak
...@@ -8490,8 +8489,6 @@ static int64_t handle_inter_mode( ...@@ -8490,8 +8489,6 @@ static int64_t handle_inter_mode(
if (have_newmv_in_inter_mode(this_mode)) { if (have_newmv_in_inter_mode(this_mode)) {
mbmi->mv[0].as_int = best_mv[0].as_int; mbmi->mv[0].as_int = best_mv[0].as_int;
mbmi->mv[1].as_int = best_mv[1].as_int; mbmi->mv[1].as_int = best_mv[1].as_int;
xd->mi[0]->bmi[0].as_mv[0].as_int = mbmi->mv[0].as_int;
xd->mi[0]->bmi[0].as_mv[1].as_int = mbmi->mv[1].as_int;
if (use_masked_motion_search(mbmi->interinter_compound_type)) { if (use_masked_motion_search(mbmi->interinter_compound_type)) {
rd_stats->rate += best_tmp_rate_mv - rate_mv; rd_stats->rate += best_tmp_rate_mv - rate_mv;
rate_mv = best_tmp_rate_mv; rate_mv = best_tmp_rate_mv;
......
...@@ -291,7 +291,7 @@ static int temporal_filter_find_matching_mb_c(AV1_COMP *cpi, ...@@ -291,7 +291,7 @@ static int temporal_filter_find_matching_mb_c(AV1_COMP *cpi,
} }
#endif #endif
x->e_mbd.mi[0]->bmi[0].as_mv[0] = x->best_mv; x->e_mbd.mi[0]->mbmi.mv[0] = x->best_mv;
// Restore input state // Restore input state
x->plane[0].src = src; x->plane[0].src = src;
...@@ -379,8 +379,8 @@ static void temporal_filter_iterate_c(AV1_COMP *cpi, ...@@ -379,8 +379,8 @@ static void temporal_filter_iterate_c(AV1_COMP *cpi,
if (frames[frame] == NULL) continue; if (frames[frame] == NULL) continue;
mbd->mi[0]->bmi[0].as_mv[0].as_mv.row = 0; mbd->mi[0]->mbmi.mv[0].as_mv.row = 0;
mbd->mi[0]->bmi[0].as_mv[0].as_mv.col = 0; mbd->mi[0]->mbmi.mv[0].as_mv.col = 0;
if (frame == alt_ref_index) { if (frame == alt_ref_index) {
filter_weight = 2; filter_weight = 2;
...@@ -402,9 +402,9 @@ static void temporal_filter_iterate_c(AV1_COMP *cpi, ...@@ -402,9 +402,9 @@ static void temporal_filter_iterate_c(AV1_COMP *cpi,
mbd, frames[frame]->y_buffer + mb_y_offset, mbd, frames[frame]->y_buffer + mb_y_offset,
frames[frame]->u_buffer + mb_uv_offset, frames[frame]->u_buffer + mb_uv_offset,
frames[frame]->v_buffer + mb_uv_offset, frames[frame]->y_stride, frames[frame]->v_buffer + mb_uv_offset, frames[frame]->y_stride,
mb_uv_width, mb_uv_height, mbd->mi[0]->bmi[0].as_mv[0].as_mv.row, mb_uv_width, mb_uv_height, mbd->mi[0]->mbmi.mv[0].as_mv.row,
mbd->mi[0]->bmi[0].as_mv[0].as_mv.col, predictor, scale, mbd->mi[0]->mbmi.mv[0].as_mv.col, predictor, scale, mb_col * 16,
mb_col * 16, mb_row * 16); mb_row * 16);
// Apply the filter (YUV) // Apply the filter (YUV)
#if CONFIG_HIGHBITDEPTH #if CONFIG_HIGHBITDEPTH
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment