Commit de005d32 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Remove unused color_sensitivity member from MACROBLOCK." into nextgenv2

parents 57aa518c debaface
......@@ -164,9 +164,6 @@ struct macroblock {
// Store the second best motion vector during full-pixel motion search
int_mv second_best_mv;
// 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];
// use default transform and skip transform type search for intra modes
int use_default_intra_tx_type;
......@@ -815,7 +815,9 @@ static void choose_partitioning(AV1_COMP *const cpi, ThreadData *const td,
AV1_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &x->e_mbd;
VAR_TREE *const vt = td->var_root[cm->mib_size_log2 - MIN_MIB_SIZE_LOG2];
int i;
const uint8_t *src;
const uint8_t *ref;
int src_stride;
......@@ -859,7 +861,6 @@ static void choose_partitioning(AV1_COMP *const cpi, ThreadData *const td,
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 = get_ref_frame_buffer(cpi, GOLDEN_FRAME);
unsigned int y_sad, y_sad_g;
......@@ -916,20 +917,6 @@ static void choose_partitioning(AV1_COMP *const cpi, ThreadData *const td,
av1_build_inter_predictors_sb(xd, mi_row, mi_col, cm->sb_size);
for (i = 1; i < MAX_MB_PLANE; ++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;
uv_sad = cpi->fn_ptr[bs].sdf(p->src.buf, p->src.stride, pd->dst.buf,
x->color_sensitivity[i - 1] = uv_sad > (y_sad >> 2);
ref = xd->plane[0].dst.buf;
ref_stride = xd->plane[0].dst.stride;
Supports Markdown
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