shithub: libvpx

Info  •  Files  •  Log  •  Branches

Add a guard on intra mode skip control for RTC mode

This commit adds a guard condition to the intra mode test skip
control in RTC coding mode. If all inter modes are skipped, force
the encoder to check intra mode. It avoids situations where the
encoder processes without properly assigning required mode
information.

Change-Id: Ibb349fee997d6584ce901d08b06e8df3ca9c01b1

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

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

@@ -837,8 +837,9 @@

   // Perform intra prediction search, if the best SAD is above a certain

   // threshold.

-  if (!x->skip && best_rdc.rdcost > inter_mode_thresh &&

-      bsize <= cpi->sf.max_intra_bsize) {

+  if (best_rdc.rdcost == INT64_MAX ||

+      (!x->skip && best_rdc.rdcost > inter_mode_thresh &&

+       bsize <= cpi->sf.max_intra_bsize)) {

     struct estimate_block_intra_args args = { cpi, x, DC_PRED, 0, 0 };

     const TX_SIZE intra_tx_size =

         MIN(max_txsize_lookup[bsize],