Skip to content

GitLab

Commit 44701f2c authored by Angie Chiang's avatar Angie Chiang
Browse files
Options

Remove redundant return in set_offsets 

Change-Id: Idf8f03052a7e21b8a273986204038545573d7962
parent f6dd3c68
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
av1/decoder/decodeframe.c
View file @ 44701f2c
...@@ -638,9 +638,9 @@ static int reconstruct_inter_block(AV1_COMMON *cm, MACROBLOCKD *const xd, ...@@ -638,9 +638,9 @@ static int reconstruct_inter_block(AV1_COMMON *cm, MACROBLOCKD *const xd,
} }
#endif // !CONFIG_VAR_TX || CONFIG_SUPER_TX #endif // !CONFIG_VAR_TX || CONFIG_SUPER_TX
static MB_MODE_INFO *set_offsets(AV1_COMMON *const cm, MACROBLOCKD *const xd, static void set_offsets(AV1_COMMON *const cm, MACROBLOCKD *const xd,
BLOCK_SIZE bsize, int mi_row, int mi_col, BLOCK_SIZE bsize, int mi_row, int mi_col, int bw,
int bw, int bh, int x_mis, int y_mis) { int bh, int x_mis, int y_mis) {
const int offset = mi_row * cm->mi_stride + mi_col; const int offset = mi_row * cm->mi_stride + mi_col;
int x, y; int x, y;
const TileInfo *const tile = &xd->tile; const TileInfo *const tile = &xd->tile;
...@@ -674,7 +674,6 @@ static MB_MODE_INFO *set_offsets(AV1_COMMON *const cm, MACROBLOCKD *const xd, ...@@ -674,7 +674,6 @@ static MB_MODE_INFO *set_offsets(AV1_COMMON *const cm, MACROBLOCKD *const xd,
#endif #endif
av1_setup_dst_planes(xd->plane, get_frame_new_buffer(cm), mi_row, mi_col); av1_setup_dst_planes(xd->plane, get_frame_new_buffer(cm), mi_row, mi_col);
return &xd->mi[0]->mbmi;
} }
#if CONFIG_SUPERTX #if CONFIG_SUPERTX
...@@ -1500,9 +1499,9 @@ static void decode_token_and_recon_block(AV1Decoder *const pbi, ...@@ -1500,9 +1499,9 @@ static void decode_token_and_recon_block(AV1Decoder *const pbi,
const int bh = mi_size_high[bsize]; const int bh = mi_size_high[bsize];
const int x_mis = AOMMIN(bw, cm->mi_cols - mi_col); const int x_mis = AOMMIN(bw, cm->mi_cols - mi_col);
const int y_mis = AOMMIN(bh, cm->mi_rows - mi_row); const int y_mis = AOMMIN(bh, cm->mi_rows - mi_row);
MB_MODE_INFO *mbmi;
mbmi = set_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis, y_mis); set_offsets(cm, xd, bsize, mi_row, mi_col, bw, bh, x_mis, y_mis);
MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
#if CONFIG_DELTA_Q #if CONFIG_DELTA_Q
if (cm->delta_q_present_flag) { if (cm->delta_q_present_flag) {
......
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