diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-07-09 15:20:18 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-07-09 15:20:18 +0000 |
| commit | 69f34e5b1f54b2200c4cb040f8bdc6855dda8597 (patch) | |
| tree | b418cf5cc0a761500f917ccdba549576e4e0c44c /libavcodec/cavsdata.h | |
| parent | e148c6e19396c8b25bcf6b47fc983cf305ea73c1 (diff) | |
| download | ffmpeg-69f34e5b1f54b2200c4cb040f8bdc6855dda8597.tar.gz | |
simplify
Originally committed as revision 5694 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/cavsdata.h')
| -rw-r--r-- | libavcodec/cavsdata.h | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h index d8de9d33bf..eea0b8df0d 100644 --- a/libavcodec/cavsdata.h +++ b/libavcodec/cavsdata.h @@ -41,6 +41,8 @@ #define BWD1 0x08 #define SYM0 0x10 #define SYM1 0x20 +#define SPLITH 0x40 +#define SPLITV 0x80 #define MV_BWD_OFFS 12 #define MV_STRIDE 4 @@ -127,17 +129,37 @@ enum mv_loc_t { MV_BWD_X3 }; -static const uint8_t b_partition_flags[14] = { - 0,0,0,0,0, - FWD0|FWD1, - BWD0|BWD1, - FWD0|BWD1, - BWD0|FWD1, - FWD0|SYM1, - BWD0|SYM1, - SYM0|FWD1, - SYM0|BWD1, - SYM0|SYM1 +static const uint8_t partition_flags[30] = { + 0, //I_8X8 + 0, //P_SKIP + 0, //P_16X16 + SPLITH, //P_16X8 + SPLITV,//P_8X16 + SPLITH|SPLITV,//P_8X8 + SPLITH|SPLITV,//B_SKIP + SPLITH|SPLITV,//B_DIRECT + 0, //B_FWD_16X16 + 0, //B_BWD_16X16 + 0, //B_SYM_16X16 + FWD0|FWD1|SPLITH, + FWD0|FWD1 |SPLITV, + BWD0|BWD1|SPLITH, + BWD0|BWD1 |SPLITV, + FWD0|BWD1|SPLITH, + FWD0|BWD1 |SPLITV, + BWD0|FWD1|SPLITH, + BWD0|FWD1 |SPLITV, + FWD0|SYM1|SPLITH, + FWD0|SYM1 |SPLITV, + BWD0|SYM1|SPLITH, + BWD0|SYM1 |SPLITV, + SYM0|FWD1|SPLITH, + SYM0|FWD1 |SPLITV, + SYM0|BWD1|SPLITH, + SYM0|BWD1 |SPLITV, + SYM0|SYM1|SPLITH, + SYM0|SYM1 |SPLITV, + SPLITH|SPLITV,//B_8X8 = 29 }; static const uint8_t scan3x3[4] = {4,5,7,8}; |