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

av1/encoder/block.h

@@ -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;

av1/encoder/encodeframe.c

@@ -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];
+#if CONFIG_DUAL_FILTER
   int i;
+#endif
   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;
-      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);
-    }
-
     ref = xd->plane[0].dst.buf;
     ref_stride = xd->plane[0].dst.stride;