Remove unused color_sensitivity member from MACROBLOCK.

Change-Id: I95fe4401291a90520f9c76e673fa0eff5f71047d
This commit is contained in:
Thomas Daede 2016-06-20 17:56:24 -07:00
Родитель bf2ad75a17
Коммит d75b2b6944
2 изменённых файлов: 0 добавлений и 19 удалений

Просмотреть файл

@ -152,10 +152,6 @@ struct macroblock {
// Used to store sub partition's choices. // Used to store sub partition's choices.
MV pred_mv[MAX_REF_FRAMES]; 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 #ifdef __cplusplus

Просмотреть файл

@ -657,7 +657,6 @@ static int choose_partitioning(AV1_COMP *cpi, const TileInfo *const tile,
if (!is_key_frame) { if (!is_key_frame) {
MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi; 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 = get_ref_frame_buffer(cpi, LAST_FRAME);
const YV12_BUFFER_CONFIG *yv12_g = NULL; 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); 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; d = xd->plane[0].dst.buf;
dp = xd->plane[0].dst.stride; dp = xd->plane[0].dst.stride;