rtc-screen: Adjust condition on intra for flat blocks
For spatially flat blocks in screen mode:
in addition to color, add condition on block size
to force intra check (force check for large blocks),
when superblock has motion.
Removes artifacts in 4K test clip with color motion.
rtc_screen speed 10: avg. bdrate gain of:-0.33/-0.35/-0.57
2 clips ~1.25% gain, several are bit-exact.
No speed change.
Change-Id: Ib2a0be1305b6ae6d71afac48ac8dec76c2588f23
diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 2fe803f..f188f0e 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -2196,7 +2196,9 @@
x->content_state_sb.source_sad_nonrd >= kHighSad) ||
(cpi->oxcf.tune_cfg.content == AOM_CONTENT_SCREEN &&
x->source_variance == 0 &&
- (x->color_sensitivity[0] == 1 || x->color_sensitivity[1] == 1)))
+ ((bsize >= BLOCK_32X32 &&
+ x->content_state_sb.source_sad_nonrd != kZeroSad) ||
+ x->color_sensitivity[0] == 1 || x->color_sensitivity[1] == 1)))
force_intra_check = 1;
// For big blocks worth checking intra (since only DC will be checked),
// even if best_early_term is set.
