diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-03-17 14:12:13 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-03-17 14:12:13 -0700 |
| commit | b93deb62512084d41171c198afa3d2d000b610aa (patch) | |
| tree | c47c9d2de91a0ec7ab4659acb5d71d17d6e947c0 /vp9/encoder/vp9_onyx_int.h | |
| parent | c8e84dd2cc1957c9490057dc75502e8deca75f2c (diff) | |
| parent | 8228ead7dfa56e532f0f2bea52711754a6317748 (diff) | |
| download | libvpx-b93deb62512084d41171c198afa3d2d000b610aa.tar libvpx-b93deb62512084d41171c198afa3d2d000b610aa.tar.gz libvpx-b93deb62512084d41171c198afa3d2d000b610aa.tar.bz2 libvpx-b93deb62512084d41171c198afa3d2d000b610aa.zip | |
Merge "Moving defines from vp9_onyx_int.h to suitable *.c files."
Diffstat (limited to 'vp9/encoder/vp9_onyx_int.h')
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 87c0086de..a6e7b8dc8 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -47,8 +47,6 @@ extern "C" { #define MIN_GF_INTERVAL 4 #endif #define DEFAULT_GF_INTERVAL 10 -#define DEFAULT_KF_BOOST 2000 -#define DEFAULT_GF_BOOST 2000 #define KEY_FRAME_CONTEXT 5 @@ -58,12 +56,6 @@ extern "C" { #define MIN_THRESHMULT 32 #define MAX_THRESHMULT 512 -#define GF_ZEROMV_ZBIN_BOOST 0 -#define LF_ZEROMV_ZBIN_BOOST 0 -#define MV_ZBIN_BOOST 0 -#define SPLIT_MV_ZBIN_BOOST 0 -#define INTRA_ZBIN_BOOST 0 - typedef struct { int nmvjointcost[MV_JOINTS]; int nmvcosts[2][MV_VALS]; @@ -188,12 +180,6 @@ typedef enum { // Other methods to come } SUBPEL_SEARCH_METHODS; -#define ALL_INTRA_MODES 0x3FF -#define INTRA_DC_ONLY 0x01 -#define INTRA_DC_TM ((1 << TM_PRED) | (1 << DC_PRED)) -#define INTRA_DC_H_V ((1 << DC_PRED) | (1 << V_PRED) | (1 << H_PRED)) -#define INTRA_DC_TM_H_V (INTRA_DC_TM | (1 << V_PRED) | (1 << H_PRED)) - typedef enum { LAST_FRAME_PARTITION_OFF = 0, LAST_FRAME_PARTITION_LOW_MOTION = 1, |