avcodec/arm/mpegvideo_arm: Use static_assert to check offsets

Also move AV_CHECK_OFFSET to its only user, namely lavc/arm/mpegvideo_arm.c and rename it to CHECK_OFFSET.

Andreas Rheinhardt committed 2 years ago

Commit e4e63771 parent 790f7932 files · +12 −16Browse files

Unified · Split

2 files

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#include <assert.h>
 #include "libavutil/attributes.h"
-#include "libavutil/internal.h"
 #include "libavutil/arm/cpu.h"
 #include "libavcodec/avcodec.h"
 #include "libavcodec/mpegvideo.h"
 #include "asm-offsets.h"
 #if HAVE_NEON
-AV_CHECK_OFFSET(MpegEncContext, y_dc_scale,       Y_DC_SCALE);
+#define CHECK_OFFSET(s, m, o)          \
-AV_CHECK_OFFSET(MpegEncContext, c_dc_scale,       C_DC_SCALE);
+    static_assert(offsetof(s, m) == o, \
-AV_CHECK_OFFSET(MpegEncContext, ac_pred,          AC_PRED);
+                  "Hardcoded ASM offset of " #s " field " #o " needs to be updated.");
-AV_CHECK_OFFSET(MpegEncContext, block_last_index, BLOCK_LAST_INDEX);
+CHECK_OFFSET(MpegEncContext, y_dc_scale,       Y_DC_SCALE);
-AV_CHECK_OFFSET(MpegEncContext, inter_scantable.raster_end,
+CHECK_OFFSET(MpegEncContext, c_dc_scale,       C_DC_SCALE);
-                INTER_SCANTAB_RASTER_END);
+CHECK_OFFSET(MpegEncContext, ac_pred,          AC_PRED);
-AV_CHECK_OFFSET(MpegEncContext, h263_aic,         H263_AIC);
+CHECK_OFFSET(MpegEncContext, block_last_index, BLOCK_LAST_INDEX);
+CHECK_OFFSET(MpegEncContext, inter_scantable.raster_end,
+             INTER_SCANTAB_RASTER_END);
+CHECK_OFFSET(MpegEncContext, h263_aic,         H263_AIC);
 #endif
 void ff_dct_unquantize_h263_inter_neon(MpegEncContext *s, int16_t *block,

@@ -76,14 +76,6 @@ · 75 unmodified lines
76		76
77	#define FF_MEMORY_POISON 0x2a	77	#define FF_MEMORY_POISON 0x2a
78		78
79	/* Check if the hard coded offset of a struct member still matches reality.
80	* Induce a compilation failure if not.
81	*/
82	#define AV_CHECK_OFFSET(s, m, o) struct check_##o { \
83	int x_##o[offsetof(s, m) == o? 1: -1]; \
84	}
85
86
87	#define FF_ALLOC_TYPED_ARRAY(p, nelem) (p = av_malloc_array(nelem, sizeof(*p)))	79	#define FF_ALLOC_TYPED_ARRAY(p, nelem) (p = av_malloc_array(nelem, sizeof(*p)))
88	#define FF_ALLOCZ_TYPED_ARRAY(p, nelem) (p = av_calloc(nelem, sizeof(*p)))	80	#define FF_ALLOCZ_TYPED_ARRAY(p, nelem) (p = av_calloc(nelem, sizeof(*p)))
89		81

Keyboard shortcuts