This broke build, note, LOCAL_ALIGNED_16() does not work either
Showing the changes to libavcodec/ppc (3 of 3 files). Show all
Unified · Split
| @@ -262,7 +262,7 @@ static av_always_inline void h264_idct_dc_add_internal(uint8_t *dst, int16_t *bl · 261 unmodified lines | ||
| 262 | 262 | vec_u8 dcplus, dcminus, v0, v1, v2, v3, aligner; |
| 263 | 263 | vec_s32 v_dc32; |
| 264 | 264 | LOAD_ZERO; |
| 265 | − LOCAL_ALIGNED(16, int, dc); | |
| 265 | + DECLARE_ALIGNED(16, int, dc); | |
| 266 | 266 | int i; |
| 267 | 267 | |
| 268 | 268 | dc = (block[0] + 32) >> 6; |
| @@ -391,7 +391,7 @@ static void h264_idct_add8_altivec(uint8_t **dest, const int *block_offset, · 122 unmodified lines | ||
| 391 | 391 | static inline void write16x4(uint8_t *dst, int dst_stride, |
| 392 | 392 | register vec_u8 r0, register vec_u8 r1, |
| 393 | 393 | register vec_u8 r2, register vec_u8 r3) { |
| 394 | − LOCAL_ALIGNED(16, unsigned char, result, [64]); | |
| 394 | + DECLARE_ALIGNED(16, unsigned char, result)[64]; | |
| 395 | 395 | uint32_t *src_int = (uint32_t *)result, *dst_int = (uint32_t *)dst; |
| 396 | 396 | int int_dst_stride = dst_stride/4; |
| 397 | 397 | |
| @@ -571,7 +571,7 @@ static inline vec_u8 h264_deblock_q1(register vec_u8 p0, · 173 unmodified lines | ||
| 571 | 571 | } |
| 572 | 572 | |
| 573 | 573 | #define h264_loop_filter_luma_altivec(p2, p1, p0, q0, q1, q2, alpha, beta, tc0) { \ |
| 574 | − LOCAL_ALIGNED(16, unsigned char, temp, [16]); \ | |
| 574 | + DECLARE_ALIGNED(16, unsigned char, temp)[16]; \ | |
| 575 | 575 | register vec_u8 alphavec; \ |
| 576 | 576 | register vec_u8 betavec; \ |
| 577 | 577 | register vec_u8 mask; \ |
| @@ -652,7 +652,7 @@ void weight_h264_W_altivec(uint8_t *block, int stride, int height, · 74 unmodified lines | ||
| 652 | 652 | vec_u8 vblock; |
| 653 | 653 | vec_s16 vtemp, vweight, voffset, v0, v1; |
| 654 | 654 | vec_u16 vlog2_denom; |
| 655 | − LOCAL_ALIGNED(16, int32_t, temp, [4]); | |
| 655 | + DECLARE_ALIGNED(16, int32_t, temp)[4]; | |
| 656 | 656 | LOAD_ZERO; |
| 657 | 657 | |
| 658 | 658 | offset <<= log2_denom; |
| @@ -701,7 +701,7 @@ void biweight_h264_W_altivec(uint8_t *dst, uint8_t *src, int stride, int height, · 42 unmodified lines | ||
| 701 | 701 | vec_u8 vsrc, vdst; |
| 702 | 702 | vec_s16 vtemp, vweights, vweightd, voffset, v0, v1, v2, v3; |
| 703 | 703 | vec_u16 vlog2_denom; |
| 704 | − LOCAL_ALIGNED(16, int32_t, temp, [4]); | |
| 704 | + DECLARE_ALIGNED(16, int32_t, temp)[4]; | |
| 705 | 705 | LOAD_ZERO; |
| 706 | 706 | |
| 707 | 707 | offset = ((offset + 1) | 1) << log2_denom; |
| @@ -73,7 +73,7 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc00_ ## CODETYPE (uint8_t *dst, con · 72 unmodified lines | ||
| 73 | 73 | \ |
| 74 | 74 | static void OPNAME ## h264_qpel ## SIZE ## _mc10_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 75 | 75 | { \ |
| 76 | − LOCAL_ALIGNED(16, uint8_t, half, [SIZE*SIZE]);\ | |
| 76 | + DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\ | |
| 77 | 77 | put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(half, src, SIZE, stride);\ |
| 78 | 78 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src, half, stride, stride, SIZE);\ |
| 79 | 79 | }\ |
| @@ -85,14 +85,14 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc20_ ## CODETYPE(uint8_t *dst, cons · 5 unmodified lines | ||
| 85 | 85 | \ |
| 86 | 86 | static void OPNAME ## h264_qpel ## SIZE ## _mc30_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 87 | 87 | {\ |
| 88 | − LOCAL_ALIGNED(16, uint8_t, half, [SIZE*SIZE]);\ | |
| 88 | + DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\ | |
| 89 | 89 | put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(half, src, SIZE, stride);\ |
| 90 | 90 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src+1, half, stride, stride, SIZE);\ |
| 91 | 91 | }\ |
| 92 | 92 | \ |
| 93 | 93 | static void OPNAME ## h264_qpel ## SIZE ## _mc01_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 94 | 94 | {\ |
| 95 | − LOCAL_ALIGNED(16, uint8_t, half, [SIZE*SIZE]);\ | |
| 95 | + DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\ | |
| 96 | 96 | put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(half, src, SIZE, stride);\ |
| 97 | 97 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src, half, stride, stride, SIZE);\ |
| 98 | 98 | }\ |
| @@ -104,15 +104,15 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc02_ ## CODETYPE(uint8_t *dst, cons · 5 unmodified lines | ||
| 104 | 104 | \ |
| 105 | 105 | static void OPNAME ## h264_qpel ## SIZE ## _mc03_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 106 | 106 | {\ |
| 107 | − LOCAL_ALIGNED(16, uint8_t, half, [SIZE*SIZE]);\ | |
| 107 | + DECLARE_ALIGNED(16, uint8_t, half)[SIZE*SIZE];\ | |
| 108 | 108 | put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(half, src, SIZE, stride);\ |
| 109 | 109 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, src+stride, half, stride, stride, SIZE);\ |
| 110 | 110 | }\ |
| 111 | 111 | \ |
| 112 | 112 | static void OPNAME ## h264_qpel ## SIZE ## _mc11_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 113 | 113 | {\ |
| 114 | − LOCAL_ALIGNED(16, uint8_t, halfH, [SIZE*SIZE]);\ | |
| 115 | − LOCAL_ALIGNED(16, uint8_t, halfV, [SIZE*SIZE]);\ | |
| 114 | + DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\ | |
| 115 | + DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\ | |
| 116 | 116 | put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\ |
| 117 | 117 | put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src, SIZE, stride);\ |
| 118 | 118 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\ |
| @@ -120,8 +120,8 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc11_ ## CODETYPE(uint8_t *dst, cons · 1 unmodified line | ||
| 120 | 120 | \ |
| 121 | 121 | static void OPNAME ## h264_qpel ## SIZE ## _mc31_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 122 | 122 | {\ |
| 123 | − LOCAL_ALIGNED(16, uint8_t, halfH, [SIZE*SIZE]);\ | |
| 124 | − LOCAL_ALIGNED(16, uint8_t, halfV, [SIZE*SIZE]);\ | |
| 123 | + DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\ | |
| 124 | + DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\ | |
| 125 | 125 | put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\ |
| 126 | 126 | put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src+1, SIZE, stride);\ |
| 127 | 127 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\ |
| @@ -129,8 +129,8 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc31_ ## CODETYPE(uint8_t *dst, cons · 1 unmodified line | ||
| 129 | 129 | \ |
| 130 | 130 | static void OPNAME ## h264_qpel ## SIZE ## _mc13_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 131 | 131 | {\ |
| 132 | − LOCAL_ALIGNED(16, uint8_t, halfH, [SIZE*SIZE]);\ | |
| 133 | − LOCAL_ALIGNED(16, uint8_t, halfV, [SIZE*SIZE]);\ | |
| 132 | + DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\ | |
| 133 | + DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\ | |
| 134 | 134 | put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\ |
| 135 | 135 | put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src, SIZE, stride);\ |
| 136 | 136 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\ |
| @@ -138,8 +138,8 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc13_ ## CODETYPE(uint8_t *dst, cons · 1 unmodified line | ||
| 138 | 138 | \ |
| 139 | 139 | static void OPNAME ## h264_qpel ## SIZE ## _mc33_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 140 | 140 | {\ |
| 141 | − LOCAL_ALIGNED(16, uint8_t, halfH, [SIZE*SIZE]);\ | |
| 142 | − LOCAL_ALIGNED(16, uint8_t, halfV, [SIZE*SIZE]);\ | |
| 141 | + DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\ | |
| 142 | + DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\ | |
| 143 | 143 | put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\ |
| 144 | 144 | put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src+1, SIZE, stride);\ |
| 145 | 145 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfV, stride, SIZE, SIZE);\ |
| @@ -147,15 +147,15 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc33_ ## CODETYPE(uint8_t *dst, cons · 1 unmodified line | ||
| 147 | 147 | \ |
| 148 | 148 | static void OPNAME ## h264_qpel ## SIZE ## _mc22_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 149 | 149 | {\ |
| 150 | − LOCAL_ALIGNED(16, int16_t, tmp, [SIZE*(SIZE+8)]);\ | |
| 150 | + DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\ | |
| 151 | 151 | OPNAME ## h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(dst, tmp, src, stride, SIZE, stride);\ |
| 152 | 152 | }\ |
| 153 | 153 | \ |
| 154 | 154 | static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 155 | 155 | {\ |
| 156 | − LOCAL_ALIGNED(16, uint8_t, halfH, [SIZE*SIZE]);\ | |
| 157 | − LOCAL_ALIGNED(16, uint8_t, halfHV, [SIZE*SIZE]);\ | |
| 158 | − LOCAL_ALIGNED(16, int16_t, tmp, [SIZE*(SIZE+8)]);\ | |
| 156 | + DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\ | |
| 157 | + DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\ | |
| 158 | + DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\ | |
| 159 | 159 | put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src, SIZE, stride);\ |
| 160 | 160 | put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\ |
| 161 | 161 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfHV, stride, SIZE, SIZE);\ |
| @@ -163,9 +163,9 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc21_ ## CODETYPE(uint8_t *dst, cons · 1 unmodified line | ||
| 163 | 163 | \ |
| 164 | 164 | static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 165 | 165 | {\ |
| 166 | − LOCAL_ALIGNED(16, uint8_t, halfH, [SIZE*SIZE]);\ | |
| 167 | − LOCAL_ALIGNED(16, uint8_t, halfHV, [SIZE*SIZE]);\ | |
| 168 | − LOCAL_ALIGNED(16, int16_t, tmp, [SIZE*(SIZE+8)]);\ | |
| 166 | + DECLARE_ALIGNED(16, uint8_t, halfH)[SIZE*SIZE];\ | |
| 167 | + DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\ | |
| 168 | + DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\ | |
| 169 | 169 | put_h264_qpel ## SIZE ## _h_lowpass_ ## CODETYPE(halfH, src + stride, SIZE, stride);\ |
| 170 | 170 | put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\ |
| 171 | 171 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfH, halfHV, stride, SIZE, SIZE);\ |
| @@ -173,9 +173,9 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc23_ ## CODETYPE(uint8_t *dst, cons · 1 unmodified line | ||
| 173 | 173 | \ |
| 174 | 174 | static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 175 | 175 | {\ |
| 176 | − LOCAL_ALIGNED(16, uint8_t, halfH, [SIZE*SIZE]);\ | |
| 177 | − LOCAL_ALIGNED(16, uint8_t, halfHV, [SIZE*SIZE]);\ | |
| 178 | − LOCAL_ALIGNED(16, int16_t, tmp, [SIZE*(SIZE+8)]);\ | |
| 176 | + DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\ | |
| 177 | + DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\ | |
| 178 | + DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\ | |
| 179 | 179 | put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src, SIZE, stride);\ |
| 180 | 180 | put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\ |
| 181 | 181 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfV, halfHV, stride, SIZE, SIZE);\ |
| @@ -183,9 +183,9 @@ static void OPNAME ## h264_qpel ## SIZE ## _mc12_ ## CODETYPE(uint8_t *dst, cons · 1 unmodified line | ||
| 183 | 183 | \ |
| 184 | 184 | static void OPNAME ## h264_qpel ## SIZE ## _mc32_ ## CODETYPE(uint8_t *dst, const uint8_t *src, ptrdiff_t stride)\ |
| 185 | 185 | {\ |
| 186 | − LOCAL_ALIGNED(16, uint8_t, halfH, [SIZE*SIZE]);\ | |
| 187 | − LOCAL_ALIGNED(16, uint8_t, halfHV, [SIZE*SIZE]);\ | |
| 188 | − LOCAL_ALIGNED(16, int16_t, tmp, [SIZE*(SIZE+8)]);\ | |
| 186 | + DECLARE_ALIGNED(16, uint8_t, halfV)[SIZE*SIZE];\ | |
| 187 | + DECLARE_ALIGNED(16, uint8_t, halfHV)[SIZE*SIZE];\ | |
| 188 | + DECLARE_ALIGNED(16, int16_t, tmp)[SIZE*(SIZE+8)];\ | |
| 189 | 189 | put_h264_qpel ## SIZE ## _v_lowpass_ ## CODETYPE(halfV, src+1, SIZE, stride);\ |
| 190 | 190 | put_h264_qpel ## SIZE ## _hv_lowpass_ ## CODETYPE(halfHV, tmp, src, SIZE, SIZE, stride);\ |
| 191 | 191 | OPNAME ## pixels ## SIZE ## _l2_ ## CODETYPE(dst, halfV, halfHV, stride, SIZE, SIZE);\ |
| @@ -270,7 +270,7 @@ void put_vp8_epel ## WIDTH ## _v ## TAPS ## _altivec(uint8_t *dst, ptrdiff_t dst · 269 unmodified lines | ||
| 270 | 270 | #define EPEL_HV(WIDTH, HTAPS, VTAPS) \ |
| 271 | 271 | static void put_vp8_epel ## WIDTH ## _h ## HTAPS ## v ## VTAPS ## _altivec(uint8_t *dst, ptrdiff_t dstride, uint8_t *src, ptrdiff_t sstride, int h, int mx, int my) \ |
| 272 | 272 | { \ |
| 273 | − LOCAL_ALIGNED(16, uint8_t, tmp, [(2*WIDTH+5)*16]); \ | |
| 273 | + DECLARE_ALIGNED(16, uint8_t, tmp)[(2*WIDTH+5)*16]; \ | |
| 274 | 274 | if (VTAPS == 6) { \ |
| 275 | 275 | put_vp8_epel ## WIDTH ## _h ## HTAPS ## _altivec(tmp, 16, src-2*sstride, sstride, h+5, mx, my); \ |
| 276 | 276 | put_vp8_epel ## WIDTH ## _v ## VTAPS ## _altivec(dst, dstride, tmp+2*16, 16, h, mx, my); \ |