commit c7825d0bb7d1ed2e4cb87fbd77216f8076f3c78b
author Fyodor Kyslov <kyslov@google.com> Tue Mar 31 15:04:01 2020 -0700
committer Fyodor Kyslov <kyslov@google.com> Tue Mar 31 23:48:46 2020 +0000
tree 3cdae1d0eab616ffa99a4f87dff5a8de27cf9fc6
parent 31a7aa505ad8a689ee81375d36b40079895aa844

AV1 RT: turn off nonRD features NA for high bitdepth

BUG=aomedia:2627

Some of the features of NonRD pick mode are not avaiable for high
bitdepth. Turning off for now as these features have not huge impact on
speed and quality

Change-Id: I233556f5e9d7e4f9795843398fff7e0dbe9acfe7

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index faeb77c..56afd79 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -1534,7 +1534,8 @@
   PRED_BUFFER tmp[4];
   DECLARE_ALIGNED(16, uint8_t, pred_buf[3 * 128 * 128]);
   PRED_BUFFER *this_mode_pred = NULL;
-  const int reuse_inter_pred = cpi->sf.rt_sf.reuse_inter_pred_nonrd;
+  const int reuse_inter_pred =
+      cpi->sf.rt_sf.reuse_inter_pred_nonrd && cm->seq_params.bit_depth == 8;
   const int bh = block_size_high[bsize];
   const int bw = block_size_wide[bsize];
   const int pixels_in_block = bh * bw;
@@ -1663,7 +1664,7 @@
   const int use_model_yrd_large =
       cpi->oxcf.rc_mode == AOM_CBR && large_block &&
       !cyclic_refresh_segment_id_boosted(xd->mi[0]->segment_id) &&
-      quant_params->base_qindex;
+      quant_params->base_qindex && cm->seq_params.bit_depth == 8;
 
 #if COLLECT_PICK_MODE_STAT
   ms_stat.num_blocks[bsize]++;