commit 18768f2bb5a7edf6b8a0fcb5ad8bdd86d80caba6
author Marco Paniconi <marpan@google.com> Tue Sep 06 07:24:51 2022 -0700
committer Marco Paniconi <marpan@google.com> Tue Sep 06 16:06:42 2022 +0000
tree 6d3ada25d30605f9efd78cd9a245dea197ec0435
parent 5c61149cca835f51ab2ecfb75c7a63c5a9c161d4

rtc-screen: Disable golden when color set on ref

Be more aggressive in disabling golden ref
when color_sensitivity_sb_g is set.
This reduces bad color artifacts for screen.
~0.8% bdrate loss at speed 10 screen,
No speed impact.

Change-Id: Ib842e7a9852a591b86c69e8371a8c9ebb58089db

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index ce5d67d..eb29cf2 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -2105,8 +2105,7 @@
   }
 
   // Skip golden reference if color is set, on flat blocks with motion.
-  if (((cpi->oxcf.tune_cfg.content == AOM_CONTENT_SCREEN &&
-        (x->color_sensitivity_sb[0] || x->color_sensitivity_sb[1])) ||
+  if (((cpi->oxcf.tune_cfg.content == AOM_CONTENT_SCREEN) ||
        (x->source_variance < 500 &&
         x->content_state_sb.source_sad_nonrd > kLowSad)) &&
       (x->color_sensitivity_sb_g[0] == 1 || x->color_sensitivity_sb_g[1] == 1))