diff options
| author | Jingning Han <jingning@google.com> | 2013-10-03 12:19:53 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-03 12:19:53 -0700 |
| commit | a55625873f4819fbbffeba0257983c553f6534a5 (patch) | |
| tree | 7c3ee82f95be1265186db2fcc79c979d3b726a77 /vp9/encoder/vp9_encodemb.h | |
| parent | 134dfea878a3793b48ddb6fa356f3b095b58334a (diff) | |
| parent | 11abab356e4c04d4a21ac43f58f9ec05c7c80eca (diff) | |
| download | libvpx-a55625873f4819fbbffeba0257983c553f6534a5.tar libvpx-a55625873f4819fbbffeba0257983c553f6534a5.tar.gz libvpx-a55625873f4819fbbffeba0257983c553f6534a5.tar.bz2 libvpx-a55625873f4819fbbffeba0257983c553f6534a5.zip | |
Merge "Refactor inter mode rate-distortion search"
Diffstat (limited to 'vp9/encoder/vp9_encodemb.h')
| -rw-r--r-- | vp9/encoder/vp9_encodemb.h | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/vp9/encoder/vp9_encodemb.h b/vp9/encoder/vp9_encodemb.h index 54e69fd9d..61dd7358e 100644 --- a/vp9/encoder/vp9_encodemb.h +++ b/vp9/encoder/vp9_encodemb.h @@ -16,32 +16,17 @@ #include "vp9/encoder/vp9_onyx_int.h" #include "vp9/common/vp9_onyxc_int.h" -typedef enum { - RD_DC_PRED = DC_PRED, - RD_V_PRED = V_PRED, - RD_H_PRED = H_PRED, - RD_D45_PRED = D45_PRED, - RD_D135_PRED = D135_PRED, - RD_D117_PRED = D117_PRED, - RD_D153_PRED = D153_PRED, - RD_D207_PRED = D207_PRED, - RD_D63_PRED = D63_PRED, - RD_TM_PRED = TM_PRED, - RD_NEARESTMV = NEARESTMV, - RD_NEARMV = NEARMV, - RD_ZEROMV = ZEROMV, - RD_NEWMV = NEWMV, - RD_I4X4_PRED, - RD_SPLITMV, - RD_MODE_COUNT -} RD_PREDICTION_MODE; - typedef struct { - RD_PREDICTION_MODE mode; + MB_PREDICTION_MODE mode; MV_REFERENCE_FRAME ref_frame; MV_REFERENCE_FRAME second_ref_frame; } MODE_DEFINITION; +typedef struct { + MV_REFERENCE_FRAME ref_frame; + MV_REFERENCE_FRAME second_ref_frame; +} REF_DEFINITION; + struct optimize_ctx { ENTROPY_CONTEXT ta[MAX_MB_PLANE][16]; ENTROPY_CONTEXT tl[MAX_MB_PLANE][16]; |