avcodec/mpegutils: Move H.264-only macros to h264dec.h

Andreas Rheinhardt committed 2 years ago

Commit f161d941 parent f5d5b802 files · +8 −8Browse files

Unified · Split

2 files

@@ -93,6 +93,14 @@ · 92 unmodified lines
93		93
94	#define IS_REF0(a) ((a) & MB_TYPE_REF0)	94	#define IS_REF0(a) ((a) & MB_TYPE_REF0)
95	#define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT)	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	* Memory management control operation.	106	* Memory management control operation.

 #define IS_16X8(a)       ((a) & MB_TYPE_16x8)
 #define IS_8X16(a)       ((a) & MB_TYPE_8x16)
 #define IS_8X8(a)        ((a) & MB_TYPE_8x8)
-#define IS_SUB_8X8(a)    ((a) & MB_TYPE_16x16) // note reused
-#define IS_SUB_8X4(a)    ((a) & MB_TYPE_16x8)  // note reused
-#define IS_SUB_4X8(a)    ((a) & MB_TYPE_8x16)  // note reused
-#define IS_SUB_4X4(a)    ((a) & MB_TYPE_8x8)   // note reused
 #define IS_ACPRED(a)     ((a) & MB_TYPE_ACPRED)
 #define IS_QUANT(a)      ((a) & MB_TYPE_QUANT)
-#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0 << ((part) + 2 * (list))))
-// does this mb use listX, note does not work if subMBs
-#define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0 | MB_TYPE_P1L0) << (2 * (list))))
 #define HAS_CBP(a)       ((a) & MB_TYPE_CBP)
 #define HAS_FORWARD_MV(a)  ((a) & MB_TYPE_FORWARD_MV)

Keyboard shortcuts