diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-06-02 18:49:53 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-06-02 18:49:53 +0000 |
| commit | a76eec3b7803a20a06f0d3a144a09deebfccdb57 (patch) | |
| tree | 8eed1013958dcfb0f2520a186b25821dfa89679b | |
| parent | 83b707613181c01fd4e9d25dda6787af439d2e41 (diff) | |
| download | ffmpeg-a76eec3b7803a20a06f0d3a144a09deebfccdb57.tar.gz | |
ARM: fail build if hardcoded struct offsets are wrong
Originally committed as revision 23427 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/arm/asm-offsets.h | 39 | ||||
| -rw-r--r-- | libavcodec/arm/mpegvideo_arm.c | 8 | ||||
| -rw-r--r-- | libavcodec/arm/mpegvideo_neon.S | 8 |
3 files changed, 48 insertions, 7 deletions
diff --git a/libavcodec/arm/asm-offsets.h b/libavcodec/arm/asm-offsets.h new file mode 100644 index 0000000000..c0cfb276f1 --- /dev/null +++ b/libavcodec/arm/asm-offsets.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2010 Mans Rullgard + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_ARM_ASM_OFFSETS_H +#define AVCODEC_ARM_ASM_OFFSETS_H + +#ifndef __ASSEMBLER__ +#include <stddef.h> +#define CHK_OFFS(s, m, o) struct check_##o { \ + int x_##o[offsetof(s, m) == o? 1: -1]; \ + } +#endif + +/* MpegEncContext */ +#define Y_DC_SCALE 0xa54 +#define C_DC_SCALE 0xa58 +#define AC_PRED 0xa80 +#define BLOCK_LAST_INDEX 0x2278 +#define INTER_SCANTAB_RASTER_END 0x2478 +#define H263_AIC 0x2728 + +#endif diff --git a/libavcodec/arm/mpegvideo_arm.c b/libavcodec/arm/mpegvideo_arm.c index e7cb9c6633..cb8a7e087e 100644 --- a/libavcodec/arm/mpegvideo_arm.c +++ b/libavcodec/arm/mpegvideo_arm.c @@ -22,6 +22,14 @@ #include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "mpegvideo_arm.h" +#include "asm-offsets.h" + +CHK_OFFS(MpegEncContext, y_dc_scale, Y_DC_SCALE); +CHK_OFFS(MpegEncContext, c_dc_scale, C_DC_SCALE); +CHK_OFFS(MpegEncContext, ac_pred, AC_PRED); +CHK_OFFS(MpegEncContext, block_last_index, BLOCK_LAST_INDEX); +CHK_OFFS(MpegEncContext, inter_scantable.raster_end, INTER_SCANTAB_RASTER_END); +CHK_OFFS(MpegEncContext, h263_aic, H263_AIC); void ff_dct_unquantize_h263_inter_neon(MpegEncContext *s, DCTELEM *block, int n, int qscale); diff --git a/libavcodec/arm/mpegvideo_neon.S b/libavcodec/arm/mpegvideo_neon.S index fa7aca13f8..b25ead4941 100644 --- a/libavcodec/arm/mpegvideo_neon.S +++ b/libavcodec/arm/mpegvideo_neon.S @@ -19,13 +19,7 @@ */ #include "asm.S" - -#define Y_DC_SCALE 0xa54 -#define C_DC_SCALE 0xa58 -#define AC_PRED 0xa80 -#define BLOCK_LAST_INDEX 0x2278 -#define INTER_SCANTAB_RASTER_END 0x2478 -#define H263_AIC 0x2728 +#include "asm-offsets.h" function ff_dct_unquantize_h263_inter_neon, export=1 add r0, r0, #0x2200 |