Do this to make MB_TYPE_{CBP,QUANT} fit into an int16_t, so that can be used in a VLC symbol table.
Unified · Split
| @@ -45,8 +45,8 @@ · 44 unmodified lines | |||
| 45 | #define MB_TYPE_8x8 (1 << 6) | 45 | #define MB_TYPE_8x8 (1 << 6) |
| 46 | #define MB_TYPE_INTERLACED (1 << 7) | 46 | #define MB_TYPE_INTERLACED (1 << 7) |
| 47 | #define MB_TYPE_DIRECT2 (1 << 8) // FIXME | 47 | #define MB_TYPE_DIRECT2 (1 << 8) // FIXME |
| 48 | #define MB_TYPE_GMC (1 << 10) | 48 | #define MB_TYPE_CBP (1 << 10) |
| 49 | #define MB_TYPE_SKIP (1 << 11) | 49 | #define MB_TYPE_QUANT (1 << 11) |
| 50 | #define MB_TYPE_P0L0 (1 << 12) | 50 | #define MB_TYPE_P0L0 (1 << 12) |
| 51 | #define MB_TYPE_P1L0 (1 << 13) | 51 | #define MB_TYPE_P1L0 (1 << 13) |
| 52 | #define MB_TYPE_P0L1 (1 << 14) | 52 | #define MB_TYPE_P0L1 (1 << 14) |
| @@ -54,8 +54,8 @@ · 1 unmodified line | |||
| 54 | #define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0) | 54 | #define MB_TYPE_L0 (MB_TYPE_P0L0 | MB_TYPE_P1L0) |
| 55 | #define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1) | 55 | #define MB_TYPE_L1 (MB_TYPE_P0L1 | MB_TYPE_P1L1) |
| 56 | #define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) | 56 | #define MB_TYPE_L0L1 (MB_TYPE_L0 | MB_TYPE_L1) |
| 57 | #define MB_TYPE_QUANT (1 << 16) | 57 | #define MB_TYPE_GMC (1 << 16) |
| 58 | #define MB_TYPE_CBP (1 << 17) | 58 | #define MB_TYPE_SKIP (1 << 17) |
| 59 | #define MB_TYPE_ACPRED (1 << 18) | 59 | #define MB_TYPE_ACPRED (1 << 18) |
| 60 | 60 | ||
| 61 | #define MB_TYPE_INTRA MB_TYPE_INTRA4x4 // default mb_type if there is just one type | 61 | #define MB_TYPE_INTRA MB_TYPE_INTRA4x4 // default mb_type if there is just one type |