commit 1b6af7220ab99cef700f714f6bc4ea29a6952464
author Hui Su <huisu@google.com> Thu Apr 08 17:56:50 2021 -0700
committer Hui Su <huisu@google.com> Fri Apr 09 16:59:02 2021 +0000
tree b8473e2b4ccce12cd41928dbe30ba5073615badf
parent d6dd6aa6a9eda7c31fae34e63c997e585c8eac5e

Fix a bug in av1_nonrd_pick_intra_mode()

Use correct intra mode cost.

Change-Id: I49cf6130b414ed736d971536dddcf9683e0ad21b

av1/encoder/nonrd_pickmode.c

diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 57eee47..136fb51 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -1673,7 +1673,9 @@
   const MB_MODE_INFO *left_mi = xd->left_mbmi;
   const PREDICTION_MODE A = av1_above_block_mode(above_mi);
   const PREDICTION_MODE L = av1_left_block_mode(left_mi);
-  bmode_costs = x->mode_costs.y_mode_costs[A][L];
+  const int above_ctx = intra_mode_context[A];
+  const int left_ctx = intra_mode_context[L];
+  bmode_costs = x->mode_costs.y_mode_costs[above_ctx][left_ctx];
 
   av1_invalid_rd_stats(&best_rdc);
   av1_invalid_rd_stats(&this_rdc);