vp9: Non-rd pickmode: fix to add ARF mode entries to THR_MODES.
authorMarco <marpan@google.com>
Mon, 23 Jan 2017 18:53:34 +0000 (10:53 -0800)
committerMarco <marpan@google.com>
Mon, 23 Jan 2017 18:56:29 +0000 (10:56 -0800)
BUG=webm:1359

Change-Id: Ie0c66efa2e19d1ec9c744d14e3fa8f1e6214cdd6

vp9/encoder/vp9_pickmode.c

index d146375..326086a 100644 (file)
@@ -958,10 +958,11 @@ static void estimate_block_intra(int plane, int block, int row, int col,
   args->rdc->dist += this_rdc.dist;
 }
 
-static const THR_MODES mode_idx[MAX_REF_FRAMES - 1][4] = {
+static const THR_MODES mode_idx[MAX_REF_FRAMES][4] = {
   { THR_DC, THR_V_PRED, THR_H_PRED, THR_TM },
   { THR_NEARESTMV, THR_NEARMV, THR_ZEROMV, THR_NEWMV },
   { THR_NEARESTG, THR_NEARG, THR_ZEROG, THR_NEWG },
+  { THR_NEARESTA, THR_NEARA, THR_ZEROA, THR_NEWA },
 };
 
 static const PREDICTION_MODE intra_mode_list[] = { DC_PRED, V_PRED, H_PRED,