diff options
author | Clément Bœsch <u@pkh.me> | 2017-04-26 15:39:28 +0300 |
---|---|---|
committer | Clément Bœsch <u@pkh.me> | 2017-04-26 15:39:28 +0300 |
commit | 3a033bc5cfaeec391a8258005e025ddf3971d8bc (patch) | |
tree | 2c86c1c92813a21266f83019c5c02151d733b66f /libavcodec/ppc | |
parent | 40cc925f9321c3665341b5a9c209cdc810446890 (diff) | |
parent | 39929e55eb13eeb8dfbe1bc99301fecf6b8942dd (diff) |
Merge commit '39929e55eb13eeb8dfbe1bc99301fecf6b8942dd'
* commit '39929e55eb13eeb8dfbe1bc99301fecf6b8942dd':
ppc: hevcdsp: Use shorthands for vector types
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/ppc')
-rw-r--r-- | libavcodec/ppc/hevcdsp.c | 18 | ||||
-rw-r--r-- | libavcodec/ppc/hevcdsp_template.c | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/ppc/hevcdsp.c b/libavcodec/ppc/hevcdsp.c index d4429b8621..120362bebf 100644 --- a/libavcodec/ppc/hevcdsp.c +++ b/libavcodec/ppc/hevcdsp.c @@ -32,7 +32,7 @@ #include "libavcodec/hevcdsp.h" #if HAVE_ALTIVEC -static const vector int16_t trans4[4] = { +static const vec_s16 trans4[4] = { { 64, 64, 64, 64, 64, 64, 64, 64 }, { 83, 36, 83, 36, 83, 36, 83, 36 }, { 64, -64, 64, -64, 64, -64, 64, -64 }, @@ -44,13 +44,13 @@ 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(vector int16_t src_01, vector int16_t src_23, - vector int32_t res[4], const int shift, int16_t *coeffs) +static void transform4x4(vec_s16 src_01, vec_s16 src_23, vec_s32 res[4], + const int shift, int16_t *coeffs) { - vector int16_t src_02, src_13; - vector int32_t zero = vec_splat_s32(0); - vector int32_t e0, o0, e1, o1; - vector int32_t add; + vec_s16 src_02, src_13; + vec_s32 zero = vec_splat_s32(0); + vec_s32 e0, o0, e1, o1; + vec_s32 add; src_13 = vec_mergel(src_01, src_23); src_02 = vec_mergeh(src_01, src_23); @@ -70,10 +70,10 @@ static void transform4x4(vector int16_t src_01, vector int16_t src_23, res[3] = vec_sub(e0, o0); } -static void scale(vector int32_t res[4], vector int16_t res_packed[2], int shift) +static void scale(vec_s32 res[4], vec_s16 res_packed[2], int shift) { int i; - vector unsigned int v_shift = vec_splat_u32(shift); + vec_u32 v_shift = vec_splat_u32(shift); for (i = 0; i < 4; i++) res[i] = vec_sra(res[i], v_shift); diff --git a/libavcodec/ppc/hevcdsp_template.c b/libavcodec/ppc/hevcdsp_template.c index f3a2ba3080..2b6411bae8 100644 --- a/libavcodec/ppc/hevcdsp_template.c +++ b/libavcodec/ppc/hevcdsp_template.c @@ -22,9 +22,9 @@ static void FUNC(ff_hevc_idct_4x4, BIT_DEPTH)(int16_t *coeffs, int col_limit) { const int shift = 7; const int shift2 = 20 - BIT_DEPTH; - vector int16_t src_01, src_23; - vector int32_t res[4]; - vector int16_t res_packed[2]; + vec_s16 src_01, src_23; + vec_s32 res[4]; + vec_s16 res_packed[2]; src_01 = vec_ld(0, coeffs); src_23 = vec_ld(16, coeffs); |