diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2016-07-09 15:30:34 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2016-07-10 13:35:41 +0200 |
| commit | 5f74bd31a9bd1ac7655103b11743c12d38e0419f (patch) | |
| tree | f7d98968a93b9c93b006bff53796e4530874a3a9 | |
| parent | fc5cdc0d5372f5103c71d5dede296734fe71ead2 (diff) | |
| download | ffmpeg-5f74bd31a9bd1ac7655103b11743c12d38e0419f.tar.gz | |
vp8/armv6: mc: avoid boolean expression in calculation
GNU as evaluates true as '-1' while Apple's variant and llvm's internal
assembler evaluate it as '1'. The best way to avoid this madness is to
eliminate boolean expressions instead of trying to fix it with
preprocessor directives. Use a direct formula to calculate the
required temporary space on the stack in
ff_put_vp8_{epel,bilin}{4,8,16}_h[246]v[246]_armv6().
Fixes a checkasm segfault in vp8dsp.mc when using llvm's internal
assembler for a non-Apple target.
| -rw-r--r-- | libavcodec/arm/vp8dsp_armv6.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index 4e83fe1466..565361e280 100644 --- a/libavcodec/arm/vp8dsp_armv6.S +++ b/libavcodec/arm/vp8dsp_armv6.S @@ -1226,13 +1226,8 @@ vp8_mc_1 bilin, 8, v vp8_mc_1 bilin, 4, h vp8_mc_1 bilin, 4, v -/* True relational expressions have the value -1 in the GNU assembler, - +1 in Apple's. */ -#ifdef __APPLE__ -# define TMPSIZE \size * (8 + 8*(\size > 4) + \ytaps - 1) -#else -# define TMPSIZE \size * (8 - 8*(\size > 4) + \ytaps - 1) -#endif +@ 4 and 8 pixel wide mc blocks might have height of 8 or 16 lines +#define TMPSIZE \size * (16 / ((16 / \size + 1) / 2) + \ytaps - 1) .macro vp8_mc_hv name, size, h, v, ytaps function ff_put_vp8_\name\size\()_\h\v\()_armv6, export=1 |