Remove an unused function Change-Id: Ie3b9c92377be8de380baa994868626a27f43a8b5
diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c index bd99cb8..cecee45 100644 --- a/av1/common/av1_loopfilter.c +++ b/av1/common/av1_loopfilter.c
@@ -1034,107 +1034,6 @@ } } -// TODO(chengchen): if lossless, do not need to setup mask. But when -// segments enabled, each segment has different lossless settings. -void av1_setup_bitmask(AV1_COMMON *const cm, int mi_row, int mi_col, int plane, - int subsampling_x, int subsampling_y, int row_end, - int col_end) { - const int num_64x64 = cm->seq_params.mib_size >> MIN_MIB_SIZE_LOG2; - for (int y = 0; y < num_64x64; ++y) { - for (int x = 0; x < num_64x64; ++x) { - const int row = mi_row + y * MI_SIZE_64X64; - const int col = mi_col + x * MI_SIZE_64X64; - if (row >= row_end || col >= col_end) continue; - if ((row << MI_SIZE_LOG2) >= cm->height || - (col << MI_SIZE_LOG2) >= cm->width) - continue; - - LoopFilterMask *lfm = get_loop_filter_mask(cm, row, col); - if (lfm == NULL) return; - - // init mask to zero - if (plane == 0) { - av1_zero(lfm->left_y); - av1_zero(lfm->above_y); - av1_zero(lfm->lfl_y_ver); - av1_zero(lfm->lfl_y_hor); - } else if (plane == 1) { - av1_zero(lfm->left_u); - av1_zero(lfm->above_u); - av1_zero(lfm->lfl_u_ver); - av1_zero(lfm->lfl_u_hor); - } else { - av1_zero(lfm->left_v); - av1_zero(lfm->above_v); - av1_zero(lfm->lfl_v_ver); - av1_zero(lfm->lfl_v_hor); - } - } - } - - // set up bitmask for each superblock - setup_block_mask(cm, mi_row, mi_col, cm->seq_params.sb_size, plane, - subsampling_x, subsampling_y); - - for (int y = 0; y < num_64x64; ++y) { - for (int x = 0; x < num_64x64; ++x) { - const int row = mi_row + y * MI_SIZE_64X64; - const int col = mi_col + x * MI_SIZE_64X64; - if (row >= row_end || col >= col_end) continue; - if ((row << MI_SIZE_LOG2) >= cm->height || - (col << MI_SIZE_LOG2) >= cm->width) - continue; - - LoopFilterMask *lfm = get_loop_filter_mask(cm, row, col); - if (lfm == NULL) return; - - // check if the mask is valid - check_loop_filter_masks(lfm, plane); - - { - // Let 16x16 hold 32x32 (Y/U/V) and 64x64(Y only). - // Even tx size is greater, we only apply max length filter, which - // is 16. - if (plane == 0) { - for (int j = 0; j < 4; ++j) { - lfm->left_y[TX_16X16].bits[j] |= lfm->left_y[TX_32X32].bits[j]; - lfm->left_y[TX_16X16].bits[j] |= lfm->left_y[TX_64X64].bits[j]; - lfm->above_y[TX_16X16].bits[j] |= lfm->above_y[TX_32X32].bits[j]; - lfm->above_y[TX_16X16].bits[j] |= lfm->above_y[TX_64X64].bits[j]; - - // set 32x32 and 64x64 to 0 - lfm->left_y[TX_32X32].bits[j] = 0; - lfm->left_y[TX_64X64].bits[j] = 0; - lfm->above_y[TX_32X32].bits[j] = 0; - lfm->above_y[TX_64X64].bits[j] = 0; - } - } else if (plane == 1) { - for (int j = 0; j < 4; ++j) { - lfm->left_u[TX_16X16].bits[j] |= lfm->left_u[TX_32X32].bits[j]; - lfm->above_u[TX_16X16].bits[j] |= lfm->above_u[TX_32X32].bits[j]; - - // set 32x32 to 0 - lfm->left_u[TX_32X32].bits[j] = 0; - lfm->above_u[TX_32X32].bits[j] = 0; - } - } else { - for (int j = 0; j < 4; ++j) { - lfm->left_v[TX_16X16].bits[j] |= lfm->left_v[TX_32X32].bits[j]; - lfm->above_v[TX_16X16].bits[j] |= lfm->above_v[TX_32X32].bits[j]; - - // set 32x32 to 0 - lfm->left_v[TX_32X32].bits[j] = 0; - lfm->above_v[TX_32X32].bits[j] = 0; - } - } - } - - // check if the mask is valid - check_loop_filter_masks(lfm, plane); - } - } -} - static void filter_selectively_vert_row2( int subsampling_factor, uint8_t *s, int pitch, int plane, uint64_t mask_16x16_0, uint64_t mask_8x8_0, uint64_t mask_4x4_0,
diff --git a/av1/common/av1_loopfilter.h b/av1/common/av1_loopfilter.h index ae4d372..ff84b2e 100644 --- a/av1/common/av1_loopfilter.h +++ b/av1/common/av1_loopfilter.h
@@ -160,10 +160,6 @@ const loop_filter_info_n *lfi_n, const int dir_idx, int plane, const MB_MODE_INFO *mbmi); #if LOOP_FILTER_BITMASK -void av1_setup_bitmask(struct AV1Common *const cm, int mi_row, int mi_col, - int plane, int subsampling_x, int subsampling_y, - int row_end, int col_end); - void av1_filter_block_plane_ver(struct AV1Common *const cm, struct macroblockd_plane *const plane_ptr, int pl, int mi_row, int mi_col);