From: Jingning Han <jingning@google.com>
Date: Wed, 22 Nov 2023 23:38:27 +0000 (-0800)
Subject: Disable intra mode search speed features conditionally
X-Git-Tag: accepted/tizen/7.0/unified/20240521.012539~1^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bd54a37d0f820970352326941224afb618af808;p=platform%2Fupstream%2Flibvpx.git

Disable intra mode search speed features conditionally

When all the inter reference frames are invalid, disable the speed
features that bypass intra mode search.

BUG=b/312517065

Change-Id: I246c953fad3be61b9d307da11c752a21a36b90ff
---

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index fc06967..974e43c 100644
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -3606,7 +3606,7 @@ void vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, TileDataEnc *tile_data,
         mode_skip_mask[GOLDEN_FRAME] |= INTER_ALL;
   }
 
-  if (bsize > sf->max_intra_bsize) {
+  if (bsize > sf->max_intra_bsize && cpi->ref_frame_flags != 0) {
     ref_frame_skip_mask[0] |= (1 << INTRA_FRAME);
     ref_frame_skip_mask[1] |= (1 << INTRA_FRAME);
   }