diff options
| author | Jason Garrett-Glaser <jason@x264.com> | 2011-02-16 09:49:50 -0800 |
|---|---|---|
| committer | Jason Garrett-Glaser <jason@x264.com> | 2011-02-17 15:25:16 -0800 |
| commit | bcf4568f183055331415ba230e82af6d59faac1c (patch) | |
| tree | 9e0018febcef9d048f7c17fdda3a72e3b49dc265 /libavcodec/vp8data.h | |
| parent | 7634771e70575b2a5abaeb420c5b3c2f9948c693 (diff) | |
VP8: split out declarations to new header
Diffstat (limited to 'libavcodec/vp8data.h')
| -rw-r--r-- | libavcodec/vp8data.h | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h index 472b37aa47..af9b0d9188 100644 --- a/libavcodec/vp8data.h +++ b/libavcodec/vp8data.h @@ -21,46 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -// TODO: move these #define and enum to a better header... - -#define VP8_MAX_QUANT 127 - -enum dct_token { - DCT_0, - DCT_1, - DCT_2, - DCT_3, - DCT_4, - DCT_CAT1, - DCT_CAT2, - DCT_CAT3, - DCT_CAT4, - DCT_CAT5, - DCT_CAT6, - DCT_EOB, - - NUM_DCT_TOKENS -}; +#ifndef AVCODEC_VP8DATA_H +#define AVCODEC_VP8DATA_H +#include "vp8.h" #include "h264pred.h" -// used to signal 4x4 intra pred in luma MBs -#define MODE_I4x4 4 - -enum inter_mvmode { - VP8_MVMODE_ZERO = MODE_I4x4 + 1, - VP8_MVMODE_MV, - VP8_MVMODE_SPLIT -}; - -enum inter_splitmvmode { - VP8_SPLITMVMODE_16x8 = 0, ///< 2 16x8 blocks (vertical) - VP8_SPLITMVMODE_8x16, ///< 2 8x16 blocks (horizontal) - VP8_SPLITMVMODE_8x8, ///< 2x2 blocks of 8x8px each - VP8_SPLITMVMODE_4x4, ///< 4x4 blocks of 4x4px each - VP8_SPLITMVMODE_NONE, ///< (only used in prediction) no split MVs -}; - static const uint8_t vp8_pred4x4_mode[] = { [DC_PRED8x8] = DC_PRED, @@ -718,3 +684,5 @@ static const uint8_t vp8_mv_default_prob[2][19] = { 204, 170, 119, 235, 140, 230, 228, 128, 130, 130, 74, 148, 180, 203, 236, 254, 254 } }; + +#endif |