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

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
release/7.1
Andreas Rheinhardt 6 months ago
parent f5d5b80f3c
commit f161d9449a
  1. 8
      libavcodec/h264dec.h
  2. 8
      libavcodec/mpegutils.h

@ -93,6 +93,14 @@
#define IS_REF0(a) ((a) & MB_TYPE_REF0)
#define IS_8x8DCT(a) ((a) & MB_TYPE_8x8DCT)
#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_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))))
/**
* Memory management control operation.

@ -82,16 +82,8 @@
#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)

Loading…
Cancel
Save