From: Jingning Han <jingning@google.com>
Date: Thu, 18 Dec 2014 01:11:39 +0000 (-0800)
Subject: Remove ARF mode entries from THR_MODES array in non-RD mode
X-Git-Tag: v1.4.0~320^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd0602e01c3dd2098b6fc4be4fe8d8bfccabd0dd;p=libvpx

Remove ARF mode entries from THR_MODES array in non-RD mode

The alternate reference frame is disabled in non-RD mode. No need
to keep the related entries in the THR_MODES array.

Change-Id: I53386f4bb1c6284f582801f27246c5edf55bc24b
---

diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c
index bae507f02..2a2de5b33 100644
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -447,11 +447,10 @@ static void estimate_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
   args->dist += dist;
 }
 
-static const THR_MODES mode_idx[MAX_REF_FRAMES][4] = {
+static const THR_MODES mode_idx[MAX_REF_FRAMES - 1][4] = {
   {THR_DC, THR_H_PRED, THR_V_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[] = {