From 1d189d64643ba7d4e18d68ac605ee2967c536919 Mon Sep 17 00:00:00 2001 From: Paul Wilkins Date: Fri, 19 Jul 2013 14:04:53 +0100 Subject: Re-order mode search in rd. Mode search order in rd loop changed to better reflect observed hit counts. Also some adjustment of the baseline mode rd thresholds to reflect the order change and observed frequencies. Change-Id: I47a131cc83e11551df8add6d6d8d413d78d3a63c --- vp9/encoder/vp9_onyx_int.h | 57 +++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 31 deletions(-) (limited to 'vp9/encoder/vp9_onyx_int.h') diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index cb8748027..00d8684ed 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -145,53 +145,48 @@ typedef struct { // const MODE_DEFINITION vp9_mode_order[MAX_MODES] used in the rd code. typedef enum { THR_NEARESTMV, + THR_NEARESTA, + THR_NEARESTG, + THR_NEWMV, + THR_COMP_NEARESTLA, THR_NEARMV, + THR_COMP_NEARESTGA, - THR_ZEROMV, THR_DC, - THR_ZEROG, - THR_NEARESTG, - - THR_ZEROA, - THR_NEARESTA, - - THR_NEARG, + THR_NEWG, + THR_NEWA, THR_NEARA, - THR_V_PRED, - THR_H_PRED, - THR_D45_PRED, - THR_D135_PRED, - THR_D117_PRED, - THR_D153_PRED, - THR_D27_PRED, - THR_D63_PRED, THR_TM, - THR_NEWMV, - THR_NEWG, - THR_NEWA, + THR_COMP_NEARLA, + THR_COMP_NEWLA, + THR_NEARG, + THR_COMP_NEARGA, + THR_COMP_NEWGA, THR_SPLITMV, THR_SPLITG, THR_SPLITA, + THR_COMP_SPLITLA, + THR_COMP_SPLITGA, - THR_B_PRED, - + THR_ZEROMV, + THR_ZEROG, + THR_ZEROA, THR_COMP_ZEROLA, - THR_COMP_NEARESTLA, - THR_COMP_NEARLA, - THR_COMP_ZEROGA, - THR_COMP_NEARESTGA, - THR_COMP_NEARGA, - THR_COMP_NEWLA, - THR_COMP_NEWGA, - - THR_COMP_SPLITLA, - THR_COMP_SPLITGA, + THR_B_PRED, + THR_H_PRED, + THR_V_PRED, + THR_D135_PRED, + THR_D27_PRED, + THR_D153_PRED, + THR_D63_PRED, + THR_D117_PRED, + THR_D45_PRED, } THR_MODES; typedef enum { -- cgit v1.2.3