shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp9-rtc: Fix color artifacts for speed >= 8

Fix to avoid color artifacts observed for speed >= 8.
In model_rd_large in non_rd pickmode: always do the
transform skipping test for UV plane.

BUG=b/136198713

Change-Id: Idd91322fb898fe731846d8581b21010096f87680
(cherry picked from commit c33c7ca85fa7b28658f3b086d579a7fbbcf41dea)

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -560,33 +560,29 @@

     // Transform skipping test in UV planes.

     for (i = 1; i <= 2; i++) {

-      if (cpi->oxcf.speed < 8 || x->color_sensitivity[i - 1]) {

-        struct macroblock_plane *const p = &x->plane[i];

-        struct macroblockd_plane *const pd = &xd->plane[i];

-        const TX_SIZE uv_tx_size = get_uv_tx_size(xd->mi[0], pd);

-        const BLOCK_SIZE unit_size = txsize_to_bsize[uv_tx_size];

-        const BLOCK_SIZE uv_bsize = get_plane_block_size(bsize, pd);

-        const int uv_bw = b_width_log2_lookup[uv_bsize];

-        const int uv_bh = b_height_log2_lookup[uv_bsize];

-        const int sf = (uv_bw - b_width_log2_lookup[unit_size]) +

-                       (uv_bh - b_height_log2_lookup[unit_size]);

-        const uint32_t uv_dc_thr = pd->dequant[0] * pd->dequant[0] >> (6 - sf);

-        const uint32_t uv_ac_thr = pd->dequant[1] * pd->dequant[1] >> (6 - sf);

-        int j = i - 1;

+      struct macroblock_plane *const p = &x->plane[i];

+      struct macroblockd_plane *const pd = &xd->plane[i];

+      const TX_SIZE uv_tx_size = get_uv_tx_size(xd->mi[0], pd);

+      const BLOCK_SIZE unit_size = txsize_to_bsize[uv_tx_size];

+      const BLOCK_SIZE uv_bsize = get_plane_block_size(bsize, pd);

+      const int uv_bw = b_width_log2_lookup[uv_bsize];

+      const int uv_bh = b_height_log2_lookup[uv_bsize];

+      const int sf = (uv_bw - b_width_log2_lookup[unit_size]) +

+                     (uv_bh - b_height_log2_lookup[unit_size]);

+      const uint32_t uv_dc_thr = pd->dequant[0] * pd->dequant[0] >> (6 - sf);

+      const uint32_t uv_ac_thr = pd->dequant[1] * pd->dequant[1] >> (6 - sf);

+      int j = i - 1;

-        vp9_build_inter_predictors_sbp(xd, mi_row, mi_col, bsize, i);

-        flag_preduv_computed[i - 1] = 1;

-        var_uv[j] = cpi->fn_ptr[uv_bsize].vf(

-            p->src.buf, p->src.stride, pd->dst.buf, pd->dst.stride, &sse_uv[j]);

+      vp9_build_inter_predictors_sbp(xd, mi_row, mi_col, bsize, i);

+      flag_preduv_computed[i - 1] = 1;

+      var_uv[j] = cpi->fn_ptr[uv_bsize].vf(

+          p->src.buf, p->src.stride, pd->dst.buf, pd->dst.stride, &sse_uv[j]);

-        if ((var_uv[j] < uv_ac_thr || var_uv[j] == 0) &&

-            (sse_uv[j] - var_uv[j] < uv_dc_thr || sse_uv[j] == var_uv[j]))

-          skip_uv[j] = 1;

-        else

-          break;

-      } else {

-        skip_uv[i - 1] = 1;

-      }

+      if ((var_uv[j] < uv_ac_thr || var_uv[j] == 0) &&

+          (sse_uv[j] - var_uv[j] < uv_dc_thr || sse_uv[j] == var_uv[j]))

+        skip_uv[j] = 1;

+      else

+        break;

     }

     // If the transform in YUV planes are skippable, the mode search checks