diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-21 00:42:00 -0500 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2018-07-21 13:36:24 +0200 |
| commit | 153fcd6de6ba558a3720c64589a7e4e9e4d62420 (patch) | |
| tree | ca8c3f40e74d3066b86e659f1cc6c7cadb28e6d1 | |
| parent | 3870ed7ab3e60d6f5da8cc4dc395be5374fedc96 (diff) | |
| download | ffmpeg-153fcd6de6ba558a3720c64589a7e4e9e4d62420.tar.gz | |
libavcodec/ppc: Fix HEVC AltiVec routines with --enable-small
GCC requires the argument to vec_splat_u32 to be a literal. The easiest
way to accomplish this is to change 'shift' to be const in scale (as it
is in the transform routine above), and convert both routines to be
inline. This way, GCC can coerce the values to literals.
Tested on a 970 (Apple G5) and POWER9 (Talos II); passed fate and played
a clip of Big Buck Bunny correctly.
Fixes ticket #7048
Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
| -rw-r--r-- | libavcodec/ppc/hevcdsp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/ppc/hevcdsp.c b/libavcodec/ppc/hevcdsp.c index 4b1037d792..dcae43305a 100644 --- a/libavcodec/ppc/hevcdsp.c +++ b/libavcodec/ppc/hevcdsp.c @@ -41,8 +41,9 @@ static const vec_u8 mask[2] = { { 0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D, 0x06, 0x07, 0x0E, 0x0F, 0x16, 0x17, 0x1E, 0x1F }, }; -static void transform4x4(vec_s16 src_01, vec_s16 src_23, vec_s32 res[4], - const int shift, int16_t *coeffs) +static av_always_inline void transform4x4(vec_s16 src_01, vec_s16 src_23, + vec_s32 res[4], const int shift, + int16_t *coeffs) { vec_s16 src_02, src_13; vec_s32 zero = vec_splat_s32(0); @@ -67,7 +68,8 @@ static void transform4x4(vec_s16 src_01, vec_s16 src_23, vec_s32 res[4], res[3] = vec_sub(e0, o0); } -static void scale(vec_s32 res[4], vec_s16 res_packed[2], int shift) +static av_always_inline void scale(vec_s32 res[4], vec_s16 res_packed[2], + const int shift) { int i; vec_u32 v_shift = vec_splat_u32(shift); |