diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-07-22 10:46:04 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-07-22 10:46:04 -0700 |
| commit | 3798d7a641d39a1afe6767b2676bedec1f5a96a2 (patch) | |
| tree | 357b871bd5d6dea559eb03301c40b328936eacb0 /vp9/encoder/vp9_onyx_int.h | |
| parent | 9ad604c6fbaeccd6abe0e82917474e9cc3f87f67 (diff) | |
| parent | 1d189d64643ba7d4e18d68ac605ee2967c536919 (diff) | |
| download | libvpx-3798d7a641d39a1afe6767b2676bedec1f5a96a2.tar libvpx-3798d7a641d39a1afe6767b2676bedec1f5a96a2.tar.gz libvpx-3798d7a641d39a1afe6767b2676bedec1f5a96a2.tar.bz2 libvpx-3798d7a641d39a1afe6767b2676bedec1f5a96a2.zip | |
Merge "Re-order mode search in rd."
Diffstat (limited to 'vp9/encoder/vp9_onyx_int.h')
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 57 |
1 files changed, 26 insertions, 31 deletions
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 { |