shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Clamp tx_size in model_rd_large"

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

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

@@ -416,6 +416,9 @@

                      tx_mode_to_biggest_tx_size[cpi->common.tx_mode]);

   }

+  // The code below for setting skip flag assumes tranform size of at least 8x8,

+  // so force this lower limit on transform.

+  if (tx_size < TX_8X8) tx_size = TX_8X8;

   xd->mi[0]->tx_size = tx_size;

   if (cpi->oxcf.content == VP9E_CONTENT_SCREEN && x->zero_temp_sad_source &&