Showing the changes to libavcodec (2 of 2 files). Show all
Unified · Split
| @@ -93,6 +93,14 @@ · 92 unmodified lines | ||
| 93 | 93 | |
| 94 | 94 | #define IS_REF0(a) ((a) & MB_TYPE_REF0) |
| 95 | 95 | #define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT) |
| 96 | +#define IS_SUB_8X8(a) ((a) & MB_TYPE_16x16) // note reused | |
| 97 | +#define IS_SUB_8X4(a) ((a) & MB_TYPE_16x8) // note reused | |
| 98 | +#define IS_SUB_4X8(a) ((a) & MB_TYPE_8x16) // note reused | |
| 99 | +#define IS_SUB_4X4(a) ((a) & MB_TYPE_8x8) // note reused | |
| 100 | +#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0 << ((part) + 2 * (list)))) | |
| 101 | + | |
| 102 | +// does this mb use listX, note does not work if subMBs | |
| 103 | +#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0 | MB_TYPE_P1L0) << (2 * (list)))) | |
| 96 | 104 | |
| 97 | 105 | /** |
| 98 | 106 | * Memory management control operation. |
| @@ -82,16 +82,8 @@ · 81 unmodified lines | ||
| 82 | 82 | #define IS_16X8(a) ((a) & MB_TYPE_16x8) |
| 83 | 83 | #define IS_8X16(a) ((a) & MB_TYPE_8x16) |
| 84 | 84 | #define IS_8X8(a) ((a) & MB_TYPE_8x8) |
| 85 | −#define IS_SUB_8X8(a) ((a) & MB_TYPE_16x16) // note reused | |
| 86 | −#define IS_SUB_8X4(a) ((a) & MB_TYPE_16x8) // note reused | |
| 87 | −#define IS_SUB_4X8(a) ((a) & MB_TYPE_8x16) // note reused | |
| 88 | −#define IS_SUB_4X4(a) ((a) & MB_TYPE_8x8) // note reused | |
| 89 | 85 | #define IS_ACPRED(a) ((a) & MB_TYPE_ACPRED) |
| 90 | 86 | #define IS_QUANT(a) ((a) & MB_TYPE_QUANT) |
| 91 | −#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0 << ((part) + 2 * (list)))) | |
| 92 | − | |
| 93 | −// does this mb use listX, note does not work if subMBs | |
| 94 | −#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0 | MB_TYPE_P1L0) << (2 * (list)))) | |
| 95 | 87 | |
| 96 | 88 | #define HAS_CBP(a) ((a) & MB_TYPE_CBP) |
| 97 | 89 | #define HAS_FORWARD_MV(a) ((a) & MB_TYPE_FORWARD_MV) |