diff --git a/av1/encoder/block.h b/av1/encoder/block.h index bd0d80752..a335e57cd 100644 --- a/av1/encoder/block.h +++ b/av1/encoder/block.h @@ -152,10 +152,6 @@ struct macroblock { // Used to store sub partition's choices. MV pred_mv[MAX_REF_FRAMES]; - - // Strong color activity detection. Used in RTC coding mode to enhance - // the visual quality at the boundary of moving color objects. - uint8_t color_sensitivity[2]; }; #ifdef __cplusplus diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c index 8fa812dde..75035eb10 100644 --- a/av1/encoder/encodeframe.c +++ b/av1/encoder/encodeframe.c @@ -657,7 +657,6 @@ static int choose_partitioning(AV1_COMP *cpi, const TileInfo *const tile, if (!is_key_frame) { MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi; - unsigned int uv_sad; const YV12_BUFFER_CONFIG *yv12 = get_ref_frame_buffer(cpi, LAST_FRAME); const YV12_BUFFER_CONFIG *yv12_g = NULL; @@ -699,20 +698,6 @@ static int choose_partitioning(AV1_COMP *cpi, const TileInfo *const tile, av1_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64); - for (i = 1; i <= 2; ++i) { - struct macroblock_plane *p = &x->plane[i]; - struct macroblockd_plane *pd = &xd->plane[i]; - const BLOCK_SIZE bs = get_plane_block_size(bsize, pd); - - if (bs == BLOCK_INVALID) - uv_sad = UINT_MAX; - else - uv_sad = cpi->fn_ptr[bs].sdf(p->src.buf, p->src.stride, pd->dst.buf, - pd->dst.stride); - - x->color_sensitivity[i - 1] = uv_sad > (y_sad >> 2); - } - d = xd->plane[0].dst.buf; dp = xd->plane[0].dst.stride;