commit 672207bb80f838cac3e86365912746e5431f8036
author Fyodor Kyslov <kyslov@google.com> Sun Jul 18 19:14:49 2021 -0700
committer Fyodor Kyslov <kyslov@google.com> Sun Jul 18 19:14:49 2021 -0700
tree 9b4f9620fc4e9469c6ec2601431eb94d1d8c30a8
parent cc2a686e4b815d8cdb0fec5362070afcac288448

AllIntra: Disable IntraBC mode if nonRD flag is set

BUG=aomedia:3099

Change-Id: I9da3c2a5cabe1a1d289ef2a6cd38c10c54d24dc7

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index caf67a0..0db99f8 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2896,7 +2896,8 @@
                                        RD_STATS *rd_stats, BLOCK_SIZE bsize,
                                        int64_t best_rd) {
   const AV1_COMMON *const cm = &cpi->common;
-  if (!av1_allow_intrabc(cm) || !cpi->oxcf.kf_cfg.enable_intrabc)
+  if (!av1_allow_intrabc(cm) || !cpi->oxcf.kf_cfg.enable_intrabc ||
+      cpi->sf.rt_sf.use_nonrd_pick_mode)
     return INT64_MAX;
   const int num_planes = av1_num_planes(cm);