All versions of MSVC that support C11 (namely >= v19.27) also support the restrict keyword, therefore av_restrict is no longer necessary since 75697836b1db3e0f0a3b7061be6be28d00c675a0.
Showing the changes to libavcodec (24 of 41 files). Show all
Unified · Split
| @@ -26,14 +26,14 @@ · 25 unmodified lines | |||
| 26 | #include "libavutil/attributes.h" | 26 | #include "libavutil/attributes.h" |
| 27 | #include "aacpsdsp.h" | 27 | #include "aacpsdsp.h" |
| 28 | 28 | ||
| 29 | static void ps_add_squares_c(INTFLOAT *av_restrict dst, | 29 | static void ps_add_squares_c(INTFLOAT *restrict dst, |
| 30 | const INTFLOAT (*src)[2], int n) | 30 | const INTFLOAT (*src)[2], int n) |
| 31 | { | 31 | { |
| 32 | for (int i = 0; i < n; i++) | 32 | for (int i = 0; i < n; i++) |
| 33 | dst[i] += (UINTFLOAT)AAC_MADD28(src[i][0], src[i][0], src[i][1], src[i][1]); | 33 | dst[i] += (UINTFLOAT)AAC_MADD28(src[i][0], src[i][0], src[i][1], src[i][1]); |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | static void ps_mul_pair_single_c(INTFLOAT (*av_restrict dst)[2], | 36 | static void ps_mul_pair_single_c(INTFLOAT (*restrict dst)[2], |
| 37 | INTFLOAT (*src0)[2], INTFLOAT *src1, | 37 | INTFLOAT (*src0)[2], INTFLOAT *src1, |
| 38 | int n) | 38 | int n) |
| 39 | { | 39 | { |
| @@ -43,7 +43,7 @@ static void ps_mul_pair_single_c(INTFLOAT (*av_restrict dst)[2], · 3 unmodified lines | |||
| 43 | } | 43 | } |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | static void ps_hybrid_analysis_c(INTFLOAT (*av_restrict out)[2], | 46 | static void ps_hybrid_analysis_c(INTFLOAT (*restrict out)[2], |
| 47 | INTFLOAT (*in)[2], | 47 | INTFLOAT (*in)[2], |
| 48 | const INTFLOAT (*filter)[8][2], | 48 | const INTFLOAT (*filter)[8][2], |
| 49 | ptrdiff_t stride, int n) | 49 | ptrdiff_t stride, int n) |
| @@ -77,7 +77,7 @@ static void ps_hybrid_analysis_c(INTFLOAT (*av_restrict out)[2], · 27 unmodified lines | |||
| 77 | } | 77 | } |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | static void ps_hybrid_analysis_ileave_c(INTFLOAT (*av_restrict out)[32][2], | 80 | static void ps_hybrid_analysis_ileave_c(INTFLOAT (*restrict out)[32][2], |
| 81 | INTFLOAT L[2][38][64], | 81 | INTFLOAT L[2][38][64], |
| 82 | int i, int len) | 82 | int i, int len) |
| 83 | { | 83 | { |
| @@ -90,7 +90,7 @@ static void ps_hybrid_analysis_ileave_c(INTFLOAT (*av_restrict out)[32][2], · 6 unmodified lines | |||
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | static void ps_hybrid_synthesis_deint_c(INTFLOAT out[2][38][64], | 92 | static void ps_hybrid_synthesis_deint_c(INTFLOAT out[2][38][64], |
| 93 | INTFLOAT (*av_restrict in)[32][2], | 93 | INTFLOAT (*restrict in)[32][2], |
| 94 | int i, int len) | 94 | int i, int len) |
| 95 | { | 95 | { |
| 96 | for (; i < 64; i++) { | 96 | for (; i < 64; i++) { |
| @@ -24,7 +24,6 @@ · 23 unmodified lines | |||
| 24 | * Bink DSP routines | 24 | * Bink DSP routines |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include "config.h" | ||
| 28 | #include "libavutil/attributes.h" | 27 | #include "libavutil/attributes.h" |
| 29 | #include "binkdsp.h" | 28 | #include "binkdsp.h" |
| 30 | 29 | ||
| @@ -131,7 +130,7 @@ static void scale_block_c(const uint8_t src[64]/*align 8*/, uint8_t *dst/*align · 100 unmodified lines | |||
| 131 | } | 130 | } |
| 132 | } | 131 | } |
| 133 | 132 | ||
| 134 | static void add_pixels8_c(uint8_t *av_restrict pixels, int16_t *block, | 133 | static void add_pixels8_c(uint8_t *restrict pixels, int16_t *block, |
| 135 | int line_size) | 134 | int line_size) |
| 136 | { | 135 | { |
| 137 | int i; | 136 | int i; |
| @@ -29,13 +29,11 @@ · 28 unmodified lines | |||
| 29 | 29 | ||
| 30 | #include <stdint.h> | 30 | #include <stdint.h> |
| 31 | 31 | ||
| 32 | #include "config.h" | ||
| 33 | |||
| 34 | typedef struct BinkDSPContext { | 32 | typedef struct BinkDSPContext { |
| 35 | void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); | 33 | void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); |
| 36 | void (*idct_add)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); | 34 | void (*idct_add)(uint8_t *dest/*align 8*/, int line_size, int32_t *block/*align 16*/); |
| 37 | void (*scale_block)(const uint8_t src[64]/*align 8*/, uint8_t *dst/*align 8*/, int linesize); | 35 | void (*scale_block)(const uint8_t src[64]/*align 8*/, uint8_t *dst/*align 8*/, int linesize); |
| 38 | void (*add_pixels8)(uint8_t *av_restrict pixels, int16_t *block, int line_size); | 36 | void (*add_pixels8)(uint8_t *restrict pixels, int16_t *block, int line_size); |
| 39 | } BinkDSPContext; | 37 | } BinkDSPContext; |
| 40 | 38 | ||
| 41 | void ff_binkdsp_init(BinkDSPContext *c); | 39 | void ff_binkdsp_init(BinkDSPContext *c); |
| @@ -78,7 +78,7 @@ static const AVClass dnxhd_class = { · 77 unmodified lines | |||
| 78 | .version = LIBAVUTIL_VERSION_INT, | 78 | .version = LIBAVUTIL_VERSION_INT, |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *av_restrict block, | 81 | static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *restrict block, |
| 82 | const uint8_t *pixels, | 82 | const uint8_t *pixels, |
| 83 | ptrdiff_t line_size) | 83 | ptrdiff_t line_size) |
| 84 | { | 84 | { |
| @@ -102,7 +102,7 @@ static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *av_restrict block, · 17 unmodified lines | |||
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | static av_always_inline | 104 | static av_always_inline |
| 105 | void dnxhd_10bit_get_pixels_8x4_sym(int16_t *av_restrict block, | 105 | void dnxhd_10bit_get_pixels_8x4_sym(int16_t *restrict block, |
| 106 | const uint8_t *pixels, | 106 | const uint8_t *pixels, |
| 107 | ptrdiff_t line_size) | 107 | ptrdiff_t line_size) |
| 108 | { | 108 | { |
| @@ -26,8 +26,6 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #include <stdint.h> | 27 | #include <stdint.h> |
| 28 | 28 | ||
| 29 | #include "config.h" | ||
| 30 | |||
| 31 | #include "libavutil/mem_internal.h" | 29 | #include "libavutil/mem_internal.h" |
| 32 | 30 | ||
| 33 | #include "mpegvideo.h" | 31 | #include "mpegvideo.h" |
| @@ -107,7 +105,7 @@ typedef struct DNXHDEncContext { · 73 unmodified lines | |||
| 107 | RCCMPEntry *mb_cmp_tmp; | 105 | RCCMPEntry *mb_cmp_tmp; |
| 108 | RCEntry *mb_rc; | 106 | RCEntry *mb_rc; |
| 109 | 107 | ||
| 110 | void (*get_pixels_8x4_sym)(int16_t *av_restrict /* align 16 */ block, | 108 | void (*get_pixels_8x4_sym)(int16_t *restrict /* align 16 */ block, |
| 111 | const uint8_t *pixels, ptrdiff_t line_size); | 109 | const uint8_t *pixels, ptrdiff_t line_size); |
| 112 | } DNXHDEncContext; | 110 | } DNXHDEncContext; |
| 113 | 111 | ||
| @@ -346,7 +346,7 @@ static inline void bit_copy(PutBitContext *pb, GetBitContext *gb) · 345 unmodified lines | |||
| 346 | put_bits(pb, bits_left, get_bits(gb, bits_left)); | 346 | put_bits(pb, bits_left, get_bits(gb, bits_left)); |
| 347 | } | 347 | } |
| 348 | 348 | ||
| 349 | static av_always_inline void put_block_8x4(int16_t *block, uint8_t *av_restrict p, int stride) | 349 | static av_always_inline void put_block_8x4(int16_t *block, uint8_t *restrict p, int stride) |
| 350 | { | 350 | { |
| 351 | int i, j; | 351 | int i, j; |
| 352 | 352 | ||
| @@ -361,7 +361,7 @@ static void do_shiftings(ELBGContext *elbg) · 360 unmodified lines | |||
| 361 | } | 361 | } |
| 362 | } | 362 | } |
| 363 | 363 | ||
| 364 | static void do_elbg(ELBGContext *av_restrict elbg, int *points, int numpoints, | 364 | static void do_elbg(ELBGContext *restrict elbg, int *points, int numpoints, |
| 365 | int max_steps) | 365 | int max_steps) |
| 366 | { | 366 | { |
| 367 | int *const size_part = elbg->size_part; | 367 | int *const size_part = elbg->size_part; |
| @@ -435,7 +435,7 @@ static void do_elbg(ELBGContext *av_restrict elbg, int *points, int numpoints, · 67 unmodified lines | |||
| 435 | * If not, it calls do_elbg for a (smaller) random sample of the points in | 435 | * If not, it calls do_elbg for a (smaller) random sample of the points in |
| 436 | * points. | 436 | * points. |
| 437 | */ | 437 | */ |
| 438 | static void init_elbg(ELBGContext *av_restrict elbg, int *points, int *temp_points, | 438 | static void init_elbg(ELBGContext *restrict elbg, int *points, int *temp_points, |
| 439 | int numpoints, int max_steps) | 439 | int numpoints, int max_steps) |
| 440 | { | 440 | { |
| 441 | int dim = elbg->dim; | 441 | int dim = elbg->dim; |
| @@ -463,7 +463,7 @@ int avpriv_elbg_do(ELBGContext **elbgp, int *points, int dim, int numpoints, · 21 unmodified lines | |||
| 463 | int *codebook, int num_cb, int max_steps, | 463 | int *codebook, int num_cb, int max_steps, |
| 464 | int *closest_cb, AVLFG *rand_state, uintptr_t flags) | 464 | int *closest_cb, AVLFG *rand_state, uintptr_t flags) |
| 465 | { | 465 | { |
| 466 | ELBGContext *const av_restrict elbg = *elbgp ? *elbgp : av_mallocz(sizeof(*elbg)); | 466 | ELBGContext *const restrict elbg = *elbgp ? *elbgp : av_mallocz(sizeof(*elbg)); |
| 467 | 467 | ||
| 468 | if (!elbg) | 468 | if (!elbg) |
| 469 | return AVERROR(ENOMEM); | 469 | return AVERROR(ENOMEM); |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | |||
| 26 | #include "hpel_template.c" | 26 | #include "hpel_template.c" |
| 27 | #include "pel_template.c" | 27 | #include "pel_template.c" |
| 28 | 28 | ||
| 29 | static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *av_restrict src, int dstStride, int srcStride, int h) | 29 | static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *restrict src, int dstStride, int srcStride, int h) |
| 30 | { | 30 | { |
| 31 | int i; | 31 | int i; |
| 32 | for(i=0; i<h; i++) | 32 | for(i=0; i<h; i++) |
| @@ -37,7 +37,7 @@ static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *av_restrict sr · 4 unmodified lines | |||
| 37 | } | 37 | } |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | static inline void FUNC(copy_block4)(uint8_t *dst, const uint8_t *av_restrict src, int dstStride, int srcStride, int h) | 40 | static inline void FUNC(copy_block4)(uint8_t *dst, const uint8_t *restrict src, int dstStride, int srcStride, int h) |
| 41 | { | 41 | { |
| 42 | int i; | 42 | int i; |
| 43 | for(i=0; i<h; i++) | 43 | for(i=0; i<h; i++) |
| @@ -48,7 +48,7 @@ static inline void FUNC(copy_block4)(uint8_t *dst, const uint8_t *av_restrict sr · 4 unmodified lines | |||
| 48 | } | 48 | } |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | static inline void FUNC(copy_block8)(uint8_t *dst, const uint8_t *av_restrict src, int dstStride, int srcStride, int h) | 51 | static inline void FUNC(copy_block8)(uint8_t *dst, const uint8_t *restrict src, int dstStride, int srcStride, int h) |
| 52 | { | 52 | { |
| 53 | int i; | 53 | int i; |
| 54 | for(i=0; i<h; i++) | 54 | for(i=0; i<h; i++) |
| @@ -60,7 +60,7 @@ static inline void FUNC(copy_block8)(uint8_t *dst, const uint8_t *av_restrict sr · 5 unmodified lines | |||
| 60 | } | 60 | } |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | static inline void FUNC(copy_block16)(uint8_t *dst, const uint8_t *av_restrict src, int dstStride, int srcStride, int h) | 63 | static inline void FUNC(copy_block16)(uint8_t *dst, const uint8_t *restrict src, int dstStride, int srcStride, int h) |
| 64 | { | 64 | { |
| 65 | int i; | 65 | int i; |
| 66 | for(i=0; i<h; i++) | 66 | for(i=0; i<h; i++) |
| @@ -75,13 +75,13 @@ static inline void FUNC(copy_block16)(uint8_t *dst, const uint8_t *av_restrict s · 8 unmodified lines | |||
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | #define H264_LOWPASS(OPNAME, OP, OP2) \ | 77 | #define H264_LOWPASS(OPNAME, OP, OP2) \ |
| 78 | static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t *p_dst, const uint8_t *av_restrict p_src, int dstStride, int srcStride)\ | 78 | static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t *p_dst, const uint8_t *restrict p_src, int dstStride, int srcStride)\ |
| 79 | {\ | 79 | {\ |
| 80 | const int h=2;\ | 80 | const int h=2;\ |
| 81 | INIT_CLIP\ | 81 | INIT_CLIP\ |
| 82 | int i;\ | 82 | int i;\ |
| 83 | pixel *dst = (pixel*)p_dst;\ | 83 | pixel *dst = (pixel*)p_dst;\ |
| 84 | const pixel *av_restrict src = (const pixel*)p_src;\ | 84 | const pixel *restrict src = (const pixel*)p_src;\ |
| 85 | dstStride >>= sizeof(pixel)-1;\ | 85 | dstStride >>= sizeof(pixel)-1;\ |
| 86 | srcStride >>= sizeof(pixel)-1;\ | 86 | srcStride >>= sizeof(pixel)-1;\ |
| 87 | for(i=0; i<h; i++)\ | 87 | for(i=0; i<h; i++)\ |
| @@ -93,13 +93,13 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t *p_dst, const · 5 unmodified lines | |||
| 93 | }\ | 93 | }\ |
| 94 | }\ | 94 | }\ |
| 95 | \ | 95 | \ |
| 96 | static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t *_dst, const uint8_t *av_restrict _src, int dstStride, int srcStride)\ | 96 | static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\ |
| 97 | {\ | 97 | {\ |
| 98 | const int w=2;\ | 98 | const int w=2;\ |
| 99 | INIT_CLIP\ | 99 | INIT_CLIP\ |
| 100 | int i;\ | 100 | int i;\ |
| 101 | pixel *dst = (pixel*)_dst;\ | 101 | pixel *dst = (pixel*)_dst;\ |
| 102 | const pixel *av_restrict src = (const pixel*)_src;\ | 102 | const pixel *restrict src = (const pixel*)_src;\ |
| 103 | dstStride >>= sizeof(pixel)-1;\ | 103 | dstStride >>= sizeof(pixel)-1;\ |
| 104 | srcStride >>= sizeof(pixel)-1;\ | 104 | srcStride >>= sizeof(pixel)-1;\ |
| 105 | for(i=0; i<w; i++)\ | 105 | for(i=0; i<w; i++)\ |
| @@ -118,7 +118,7 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t *_dst, const · 12 unmodified lines | |||
| 118 | }\ | 118 | }\ |
| 119 | }\ | 119 | }\ |
| 120 | \ | 120 | \ |
| 121 | static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, const uint8_t *av_restrict _src, int dstStride, int tmpStride, int srcStride)\ | 121 | static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, const uint8_t *restrict _src, int dstStride, int tmpStride, int srcStride)\ |
| 122 | {\ | 122 | {\ |
| 123 | const int h=2;\ | 123 | const int h=2;\ |
| 124 | const int w=2;\ | 124 | const int w=2;\ |
| @@ -126,7 +126,7 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, pixel · 1 unmodified line | |||
| 126 | INIT_CLIP\ | 126 | INIT_CLIP\ |
| 127 | int i;\ | 127 | int i;\ |
| 128 | pixel *dst = (pixel*)_dst;\ | 128 | pixel *dst = (pixel*)_dst;\ |
| 129 | const pixel *av_restrict src = (const pixel*)_src;\ | 129 | const pixel *restrict src = (const pixel*)_src;\ |
| 130 | dstStride >>= sizeof(pixel)-1;\ | 130 | dstStride >>= sizeof(pixel)-1;\ |
| 131 | srcStride >>= sizeof(pixel)-1;\ | 131 | srcStride >>= sizeof(pixel)-1;\ |
| 132 | src -= 2*srcStride;\ | 132 | src -= 2*srcStride;\ |
| @@ -153,13 +153,13 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, pixel · 20 unmodified lines | |||
| 153 | tmp++;\ | 153 | tmp++;\ |
| 154 | }\ | 154 | }\ |
| 155 | }\ | 155 | }\ |
| 156 | static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t *_dst, const uint8_t *av_restrict _src, int dstStride, int srcStride)\ | 156 | static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\ |
| 157 | {\ | 157 | {\ |
| 158 | const int h=4;\ | 158 | const int h=4;\ |
| 159 | INIT_CLIP\ | 159 | INIT_CLIP\ |
| 160 | int i;\ | 160 | int i;\ |
| 161 | pixel *dst = (pixel*)_dst;\ | 161 | pixel *dst = (pixel*)_dst;\ |
| 162 | const pixel *av_restrict src = (const pixel*)_src;\ | 162 | const pixel *restrict src = (const pixel*)_src;\ |
| 163 | dstStride >>= sizeof(pixel)-1;\ | 163 | dstStride >>= sizeof(pixel)-1;\ |
| 164 | srcStride >>= sizeof(pixel)-1;\ | 164 | srcStride >>= sizeof(pixel)-1;\ |
| 165 | for(i=0; i<h; i++)\ | 165 | for(i=0; i<h; i++)\ |
| @@ -173,13 +173,13 @@ static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t *_dst, const uint8_t *a · 7 unmodified lines | |||
| 173 | }\ | 173 | }\ |
| 174 | }\ | 174 | }\ |
| 175 | \ | 175 | \ |
| 176 | static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t *_dst, const uint8_t *av_restrict _src, int dstStride, int srcStride)\ | 176 | static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\ |
| 177 | {\ | 177 | {\ |
| 178 | const int w=4;\ | 178 | const int w=4;\ |
| 179 | INIT_CLIP\ | 179 | INIT_CLIP\ |
| 180 | int i;\ | 180 | int i;\ |
| 181 | pixel *dst = (pixel*)_dst;\ | 181 | pixel *dst = (pixel*)_dst;\ |
| 182 | const pixel *av_restrict src = (const pixel*)_src;\ | 182 | const pixel *restrict src = (const pixel*)_src;\ |
| 183 | dstStride >>= sizeof(pixel)-1;\ | 183 | dstStride >>= sizeof(pixel)-1;\ |
| 184 | srcStride >>= sizeof(pixel)-1;\ | 184 | srcStride >>= sizeof(pixel)-1;\ |
| 185 | for(i=0; i<w; i++)\ | 185 | for(i=0; i<w; i++)\ |
| @@ -202,7 +202,7 @@ static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t *_dst, const uint8_t *a · 16 unmodified lines | |||
| 202 | }\ | 202 | }\ |
| 203 | }\ | 203 | }\ |
| 204 | \ | 204 | \ |
| 205 | static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, const uint8_t *av_restrict _src, int dstStride, int tmpStride, int srcStride)\ | 205 | static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, const uint8_t *restrict _src, int dstStride, int tmpStride, int srcStride)\ |
| 206 | {\ | 206 | {\ |
| 207 | const int h=4;\ | 207 | const int h=4;\ |
| 208 | const int w=4;\ | 208 | const int w=4;\ |
| @@ -210,7 +210,7 @@ static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, · 1 unmodified line | |||
| 210 | INIT_CLIP\ | 210 | INIT_CLIP\ |
| 211 | int i;\ | 211 | int i;\ |
| 212 | pixel *dst = (pixel*)_dst;\ | 212 | pixel *dst = (pixel*)_dst;\ |
| 213 | const pixel *av_restrict src = (const pixel*)_src;\ | 213 | const pixel *restrict src = (const pixel*)_src;\ |
| 214 | dstStride >>= sizeof(pixel)-1;\ | 214 | dstStride >>= sizeof(pixel)-1;\ |
| 215 | srcStride >>= sizeof(pixel)-1;\ | 215 | srcStride >>= sizeof(pixel)-1;\ |
| 216 | src -= 2*srcStride;\ | 216 | src -= 2*srcStride;\ |
| @@ -244,13 +244,13 @@ static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, · 27 unmodified lines | |||
| 244 | }\ | 244 | }\ |
| 245 | }\ | 245 | }\ |
| 246 | \ | 246 | \ |
| 247 | static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t *_dst, const uint8_t *av_restrict _src, int dstStride, int srcStride)\ | 247 | static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\ |
| 248 | {\ | 248 | {\ |
| 249 | const int h=8;\ | 249 | const int h=8;\ |
| 250 | INIT_CLIP\ | 250 | INIT_CLIP\ |
| 251 | int i;\ | 251 | int i;\ |
| 252 | pixel *dst = (pixel*)_dst;\ | 252 | pixel *dst = (pixel*)_dst;\ |
| 253 | const pixel *av_restrict src = (const pixel*)_src;\ | 253 | const pixel *restrict src = (const pixel*)_src;\ |
| 254 | dstStride >>= sizeof(pixel)-1;\ | 254 | dstStride >>= sizeof(pixel)-1;\ |
| 255 | srcStride >>= sizeof(pixel)-1;\ | 255 | srcStride >>= sizeof(pixel)-1;\ |
| 256 | for(i=0; i<h; i++)\ | 256 | for(i=0; i<h; i++)\ |
| @@ -268,13 +268,13 @@ static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t *_dst, const uint8_t *a · 11 unmodified lines | |||
| 268 | }\ | 268 | }\ |
| 269 | }\ | 269 | }\ |
| 270 | \ | 270 | \ |
| 271 | static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t *_dst, const uint8_t *av_restrict _src, int dstStride, int srcStride)\ | 271 | static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\ |
| 272 | {\ | 272 | {\ |
| 273 | const int w=8;\ | 273 | const int w=8;\ |
| 274 | INIT_CLIP\ | 274 | INIT_CLIP\ |
| 275 | int i;\ | 275 | int i;\ |
| 276 | pixel *dst = (pixel*)_dst;\ | 276 | pixel *dst = (pixel*)_dst;\ |
| 277 | const pixel *av_restrict src = (const pixel*)_src;\ | 277 | const pixel *restrict src = (const pixel*)_src;\ |
| 278 | dstStride >>= sizeof(pixel)-1;\ | 278 | dstStride >>= sizeof(pixel)-1;\ |
| 279 | srcStride >>= sizeof(pixel)-1;\ | 279 | srcStride >>= sizeof(pixel)-1;\ |
| 280 | for(i=0; i<w; i++)\ | 280 | for(i=0; i<w; i++)\ |
| @@ -305,7 +305,7 @@ static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t *_dst, const uint8_t *a · 24 unmodified lines | |||
| 305 | }\ | 305 | }\ |
| 306 | }\ | 306 | }\ |
| 307 | \ | 307 | \ |
| 308 | static void FUNC(OPNAME ## h264_qpel8_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, const uint8_t *av_restrict _src, int dstStride, int tmpStride, int srcStride)\ | 308 | static void FUNC(OPNAME ## h264_qpel8_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, const uint8_t *restrict _src, int dstStride, int tmpStride, int srcStride)\ |
| 309 | {\ | 309 | {\ |
| 310 | const int h=8;\ | 310 | const int h=8;\ |
| 311 | const int w=8;\ | 311 | const int w=8;\ |
| @@ -313,7 +313,7 @@ static void FUNC(OPNAME ## h264_qpel8_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, · 1 unmodified line | |||
| 313 | INIT_CLIP\ | 313 | INIT_CLIP\ |
| 314 | int i;\ | 314 | int i;\ |
| 315 | pixel *dst = (pixel*)_dst;\ | 315 | pixel *dst = (pixel*)_dst;\ |
| 316 | const pixel *av_restrict src = (const pixel*)_src;\ | 316 | const pixel *restrict src = (const pixel*)_src;\ |
| 317 | dstStride >>= sizeof(pixel)-1;\ | 317 | dstStride >>= sizeof(pixel)-1;\ |
| 318 | srcStride >>= sizeof(pixel)-1;\ | 318 | srcStride >>= sizeof(pixel)-1;\ |
| 319 | src -= 2*srcStride;\ | 319 | src -= 2*srcStride;\ |
| @@ -359,7 +359,7 @@ static void FUNC(OPNAME ## h264_qpel8_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp, · 39 unmodified lines | |||
| 359 | }\ | 359 | }\ |
| 360 | }\ | 360 | }\ |
| 361 | \ | 361 | \ |
| 362 | static void FUNC(OPNAME ## h264_qpel16_v_lowpass)(uint8_t *dst, const uint8_t *av_restrict src, int dstStride, int srcStride)\ | 362 | static void FUNC(OPNAME ## h264_qpel16_v_lowpass)(uint8_t *dst, const uint8_t *restrict src, int dstStride, int srcStride)\ |
| 363 | {\ | 363 | {\ |
| 364 | FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst , src , dstStride, srcStride);\ | 364 | FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst , src , dstStride, srcStride);\ |
| 365 | FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\ | 365 | FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\ |
| @@ -369,7 +369,7 @@ static void FUNC(OPNAME ## h264_qpel16_v_lowpass)(uint8_t *dst, const uint8_t *a · 3 unmodified lines | |||
| 369 | FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\ | 369 | FUNC(OPNAME ## h264_qpel8_v_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\ |
| 370 | }\ | 370 | }\ |
| 371 | \ | 371 | \ |
| 372 | static void FUNC(OPNAME ## h264_qpel16_h_lowpass)(uint8_t *dst, const uint8_t *av_restrict src, int dstStride, int srcStride)\ | 372 | static void FUNC(OPNAME ## h264_qpel16_h_lowpass)(uint8_t *dst, const uint8_t *restrict src, int dstStride, int srcStride)\ |
| 373 | {\ | 373 | {\ |
| 374 | FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst , src , dstStride, srcStride);\ | 374 | FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst , src , dstStride, srcStride);\ |
| 375 | FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\ | 375 | FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\ |
| @@ -379,7 +379,7 @@ static void FUNC(OPNAME ## h264_qpel16_h_lowpass)(uint8_t *dst, const uint8_t *a · 3 unmodified lines | |||
| 379 | FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\ | 379 | FUNC(OPNAME ## h264_qpel8_h_lowpass)(dst+8*sizeof(pixel), src+8*sizeof(pixel), dstStride, srcStride);\ |
| 380 | }\ | 380 | }\ |
| 381 | \ | 381 | \ |
| 382 | static void FUNC(OPNAME ## h264_qpel16_hv_lowpass)(uint8_t *dst, pixeltmp *tmp, const uint8_t *av_restrict src, int dstStride, int tmpStride, int srcStride){\ | 382 | static void FUNC(OPNAME ## h264_qpel16_hv_lowpass)(uint8_t *dst, pixeltmp *tmp, const uint8_t *restrict src, int dstStride, int tmpStride, int srcStride){\ |
| 383 | FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst , tmp , src , dstStride, tmpStride, srcStride);\ | 383 | FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst , tmp , src , dstStride, tmpStride, srcStride);\ |
| 384 | FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst+8*sizeof(pixel), tmp+8, src+8*sizeof(pixel), dstStride, tmpStride, srcStride);\ | 384 | FUNC(OPNAME ## h264_qpel8_hv_lowpass)(dst+8*sizeof(pixel), tmp+8, src+8*sizeof(pixel), dstStride, tmpStride, srcStride);\ |
| 385 | src += 8*srcStride;\ | 385 | src += 8*srcStride;\ |
| @@ -389,31 +389,31 @@ static void FUNC(OPNAME ## h264_qpel16_hv_lowpass)(uint8_t *dst, pixeltmp *tmp, · 3 unmodified lines | |||
| 389 | }\ | 389 | }\ |
| 390 | 390 | ||
| 391 | #define H264_MC(OPNAME, SIZE) \ | 391 | #define H264_MC(OPNAME, SIZE) \ |
| 392 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc00)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 392 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc00)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 393 | {\ | 393 | {\ |
| 394 | FUNCC(OPNAME ## pixels ## SIZE)(dst, src, stride, SIZE);\ | 394 | FUNCC(OPNAME ## pixels ## SIZE)(dst, src, stride, SIZE);\ |
| 395 | }\ | 395 | }\ |
| 396 | \ | 396 | \ |
| 397 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc10)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 397 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc10)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 398 | {\ | 398 | {\ |
| 399 | uint8_t half[SIZE*SIZE*sizeof(pixel)];\ | 399 | uint8_t half[SIZE*SIZE*sizeof(pixel)];\ |
| 400 | FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(half, src, SIZE*sizeof(pixel), stride);\ | 400 | FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(half, src, SIZE*sizeof(pixel), stride);\ |
| 401 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, src, half, stride, stride, SIZE*sizeof(pixel), SIZE);\ | 401 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, src, half, stride, stride, SIZE*sizeof(pixel), SIZE);\ |
| 402 | }\ | 402 | }\ |
| 403 | \ | 403 | \ |
| 404 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc20)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 404 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc20)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 405 | {\ | 405 | {\ |
| 406 | FUNC(OPNAME ## h264_qpel ## SIZE ## _h_lowpass)(dst, src, stride, stride);\ | 406 | FUNC(OPNAME ## h264_qpel ## SIZE ## _h_lowpass)(dst, src, stride, stride);\ |
| 407 | }\ | 407 | }\ |
| 408 | \ | 408 | \ |
| 409 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc30)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 409 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc30)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 410 | {\ | 410 | {\ |
| 411 | uint8_t half[SIZE*SIZE*sizeof(pixel)];\ | 411 | uint8_t half[SIZE*SIZE*sizeof(pixel)];\ |
| 412 | FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(half, src, SIZE*sizeof(pixel), stride);\ | 412 | FUNC(put_h264_qpel ## SIZE ## _h_lowpass)(half, src, SIZE*sizeof(pixel), stride);\ |
| 413 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, src+sizeof(pixel), half, stride, stride, SIZE*sizeof(pixel), SIZE);\ | 413 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, src+sizeof(pixel), half, stride, stride, SIZE*sizeof(pixel), SIZE);\ |
| 414 | }\ | 414 | }\ |
| 415 | \ | 415 | \ |
| 416 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc01)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 416 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc01)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 417 | {\ | 417 | {\ |
| 418 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ | 418 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 419 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ | 419 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ |
| @@ -423,7 +423,7 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc01)(uint8_t *dst, const uint · 3 unmodified lines | |||
| 423 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, full_mid, half, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ | 423 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, full_mid, half, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ |
| 424 | }\ | 424 | }\ |
| 425 | \ | 425 | \ |
| 426 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc02)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 426 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc02)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 427 | {\ | 427 | {\ |
| 428 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ | 428 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 429 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ | 429 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ |
| @@ -431,7 +431,7 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc02)(uint8_t *dst, const uint · 1 unmodified line | |||
| 431 | FUNC(OPNAME ## h264_qpel ## SIZE ## _v_lowpass)(dst, full_mid, stride, SIZE*sizeof(pixel));\ | 431 | FUNC(OPNAME ## h264_qpel ## SIZE ## _v_lowpass)(dst, full_mid, stride, SIZE*sizeof(pixel));\ |
| 432 | }\ | 432 | }\ |
| 433 | \ | 433 | \ |
| 434 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc03)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 434 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc03)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 435 | {\ | 435 | {\ |
| 436 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ | 436 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 437 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ | 437 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ |
| @@ -441,7 +441,7 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc03)(uint8_t *dst, const uint · 3 unmodified lines | |||
| 441 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, full_mid+SIZE*sizeof(pixel), half, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ | 441 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, full_mid+SIZE*sizeof(pixel), half, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ |
| 442 | }\ | 442 | }\ |
| 443 | \ | 443 | \ |
| 444 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc11)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 444 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc11)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 445 | {\ | 445 | {\ |
| 446 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ | 446 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 447 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ | 447 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ |
| @@ -453,7 +453,7 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc11)(uint8_t *dst, const uint · 5 unmodified lines | |||
| 453 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ | 453 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ |
| 454 | }\ | 454 | }\ |
| 455 | \ | 455 | \ |
| 456 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc31)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 456 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc31)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 457 | {\ | 457 | {\ |
| 458 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ | 458 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 459 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ | 459 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ |
| @@ -465,7 +465,7 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc31)(uint8_t *dst, const uint · 5 unmodified lines | |||
| 465 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ | 465 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ |
| 466 | }\ | 466 | }\ |
| 467 | \ | 467 | \ |
| 468 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc13)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 468 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc13)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 469 | {\ | 469 | {\ |
| 470 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ | 470 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 471 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ | 471 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ |
| @@ -477,7 +477,7 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc13)(uint8_t *dst, const uint · 5 unmodified lines | |||
| 477 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ | 477 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ |
| 478 | }\ | 478 | }\ |
| 479 | \ | 479 | \ |
| 480 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc33)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 480 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc33)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 481 | {\ | 481 | {\ |
| 482 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ | 482 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 483 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ | 483 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ |
| @@ -489,13 +489,13 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc33)(uint8_t *dst, const uint · 5 unmodified lines | |||
| 489 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ | 489 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ |
| 490 | }\ | 490 | }\ |
| 491 | \ | 491 | \ |
| 492 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc22)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 492 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc22)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 493 | {\ | 493 | {\ |
| 494 | pixeltmp tmp[SIZE*(SIZE+5)*sizeof(pixel)];\ | 494 | pixeltmp tmp[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 495 | FUNC(OPNAME ## h264_qpel ## SIZE ## _hv_lowpass)(dst, tmp, src, stride, SIZE*sizeof(pixel), stride);\ | 495 | FUNC(OPNAME ## h264_qpel ## SIZE ## _hv_lowpass)(dst, tmp, src, stride, SIZE*sizeof(pixel), stride);\ |
| 496 | }\ | 496 | }\ |
| 497 | \ | 497 | \ |
| 498 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc21)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 498 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc21)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 499 | {\ | 499 | {\ |
| 500 | pixeltmp tmp[SIZE*(SIZE+5)*sizeof(pixel)];\ | 500 | pixeltmp tmp[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 501 | uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\ | 501 | uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\ |
| @@ -505,7 +505,7 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc21)(uint8_t *dst, const uint · 3 unmodified lines | |||
| 505 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ | 505 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ |
| 506 | }\ | 506 | }\ |
| 507 | \ | 507 | \ |
| 508 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc23)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 508 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc23)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 509 | {\ | 509 | {\ |
| 510 | pixeltmp tmp[SIZE*(SIZE+5)*sizeof(pixel)];\ | 510 | pixeltmp tmp[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 511 | uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\ | 511 | uint8_t halfH[SIZE*SIZE*sizeof(pixel)];\ |
| @@ -515,7 +515,7 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc23)(uint8_t *dst, const uint · 3 unmodified lines | |||
| 515 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ | 515 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfH, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ |
| 516 | }\ | 516 | }\ |
| 517 | \ | 517 | \ |
| 518 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc12)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 518 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc12)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 519 | {\ | 519 | {\ |
| 520 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ | 520 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 521 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ | 521 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ |
| @@ -528,7 +528,7 @@ static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc12)(uint8_t *dst, const uint · 6 unmodified lines | |||
| 528 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfV, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ | 528 | FUNC(OPNAME ## pixels ## SIZE ## _l2)(dst, halfV, halfHV, stride, SIZE*sizeof(pixel), SIZE*sizeof(pixel), SIZE);\ |
| 529 | }\ | 529 | }\ |
| 530 | \ | 530 | \ |
| 531 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc32)(uint8_t *dst, const uint8_t *av_restrict src, ptrdiff_t stride)\ | 531 | static void FUNCC(OPNAME ## h264_qpel ## SIZE ## _mc32)(uint8_t *dst, const uint8_t *restrict src, ptrdiff_t stride)\ |
| 532 | {\ | 532 | {\ |
| 533 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ | 533 | uint8_t full[SIZE*(SIZE+5)*sizeof(pixel)];\ |
| 534 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ | 534 | uint8_t * const full_mid= full + SIZE*2*sizeof(pixel);\ |
| @@ -70,7 +70,7 @@ av_cold void ff_init_scantable_permutation(uint8_t *idct_permutation, · 69 unmodified lines | |||
| 70 | } | 70 | } |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | void ff_put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, | 73 | void ff_put_pixels_clamped_c(const int16_t *block, uint8_t *restrict pixels, |
| 74 | ptrdiff_t line_size) | 74 | ptrdiff_t line_size) |
| 75 | { | 75 | { |
| 76 | int i; | 76 | int i; |
| @@ -91,7 +91,7 @@ void ff_put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, · 14 unmodified lines | |||
| 91 | } | 91 | } |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | static void put_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pixels, | 94 | static void put_pixels_clamped4_c(const int16_t *block, uint8_t *restrict pixels, |
| 95 | int line_size) | 95 | int line_size) |
| 96 | { | 96 | { |
| 97 | int i; | 97 | int i; |
| @@ -108,7 +108,7 @@ static void put_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pix · 10 unmodified lines | |||
| 108 | } | 108 | } |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | static void put_pixels_clamped2_c(const int16_t *block, uint8_t *av_restrict pixels, | 111 | static void put_pixels_clamped2_c(const int16_t *block, uint8_t *restrict pixels, |
| 112 | int line_size) | 112 | int line_size) |
| 113 | { | 113 | { |
| 114 | int i; | 114 | int i; |
| @@ -124,7 +124,7 @@ static void put_pixels_clamped2_c(const int16_t *block, uint8_t *av_restrict pix · 9 unmodified lines | |||
| 124 | } | 124 | } |
| 125 | 125 | ||
| 126 | static void put_signed_pixels_clamped_c(const int16_t *block, | 126 | static void put_signed_pixels_clamped_c(const int16_t *block, |
| 127 | uint8_t *av_restrict pixels, | 127 | uint8_t *restrict pixels, |
| 128 | ptrdiff_t line_size) | 128 | ptrdiff_t line_size) |
| 129 | { | 129 | { |
| 130 | int i, j; | 130 | int i, j; |
| @@ -144,7 +144,7 @@ static void put_signed_pixels_clamped_c(const int16_t *block, · 13 unmodified lines | |||
| 144 | } | 144 | } |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | void ff_add_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, | 147 | void ff_add_pixels_clamped_c(const int16_t *block, uint8_t *restrict pixels, |
| 148 | ptrdiff_t line_size) | 148 | ptrdiff_t line_size) |
| 149 | { | 149 | { |
| 150 | int i; | 150 | int i; |
| @@ -164,7 +164,7 @@ void ff_add_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, · 13 unmodified lines | |||
| 164 | } | 164 | } |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | static void add_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pixels, | 167 | static void add_pixels_clamped4_c(const int16_t *block, uint8_t *restrict pixels, |
| 168 | int line_size) | 168 | int line_size) |
| 169 | { | 169 | { |
| 170 | int i; | 170 | int i; |
| @@ -180,7 +180,7 @@ static void add_pixels_clamped4_c(const int16_t *block, uint8_t *av_restrict pix · 9 unmodified lines | |||
| 180 | } | 180 | } |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | static void add_pixels_clamped2_c(const int16_t *block, uint8_t *av_restrict pixels, | 183 | static void add_pixels_clamped2_c(const int16_t *block, uint8_t *restrict pixels, |
| 184 | int line_size) | 184 | int line_size) |
| 185 | { | 185 | { |
| 186 | int i; | 186 | int i; |
| @@ -22,8 +22,6 @@ · 21 unmodified lines | |||
| 22 | #include <stddef.h> | 22 | #include <stddef.h> |
| 23 | #include <stdint.h> | 23 | #include <stdint.h> |
| 24 | 24 | ||
| 25 | #include "config.h" | ||
| 26 | |||
| 27 | struct AVCodecContext; | 25 | struct AVCodecContext; |
| 28 | 26 | ||
| 29 | enum idct_permutation_type { | 27 | enum idct_permutation_type { |
| @@ -45,13 +43,13 @@ int ff_init_scantable_permutation_x86(uint8_t *idct_permutation, · 15 unmodified lines | |||
| 45 | typedef struct IDCTDSPContext { | 43 | typedef struct IDCTDSPContext { |
| 46 | /* pixel ops : interface with DCT */ | 44 | /* pixel ops : interface with DCT */ |
| 47 | void (*put_pixels_clamped)(const int16_t *block /* align 16 */, | 45 | void (*put_pixels_clamped)(const int16_t *block /* align 16 */, |
| 48 | uint8_t *av_restrict pixels /* align 8 */, | 46 | uint8_t *restrict pixels /* align 8 */, |
| 49 | ptrdiff_t line_size); | 47 | ptrdiff_t line_size); |
| 50 | void (*put_signed_pixels_clamped)(const int16_t *block /* align 16 */, | 48 | void (*put_signed_pixels_clamped)(const int16_t *block /* align 16 */, |
| 51 | uint8_t *av_restrict pixels /* align 8 */, | 49 | uint8_t *restrict pixels /* align 8 */, |
| 52 | ptrdiff_t line_size); | 50 | ptrdiff_t line_size); |
| 53 | void (*add_pixels_clamped)(const int16_t *block /* align 16 */, | 51 | void (*add_pixels_clamped)(const int16_t *block /* align 16 */, |
| 54 | uint8_t *av_restrict pixels /* align 8 */, | 52 | uint8_t *restrict pixels /* align 8 */, |
| 55 | ptrdiff_t line_size); | 53 | ptrdiff_t line_size); |
| 56 | 54 | ||
| 57 | void (*idct)(int16_t *block /* align 16 */); | 55 | void (*idct)(int16_t *block /* align 16 */); |
| @@ -91,9 +89,9 @@ typedef struct IDCTDSPContext { · 33 unmodified lines | |||
| 91 | int mpeg4_studio_profile; | 89 | int mpeg4_studio_profile; |
| 92 | } IDCTDSPContext; | 90 | } IDCTDSPContext; |
| 93 | 91 | ||
| 94 | void ff_put_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, | 92 | void ff_put_pixels_clamped_c(const int16_t *block, uint8_t *restrict pixels, |
| 95 | ptrdiff_t line_size); | 93 | ptrdiff_t line_size); |
| 96 | void ff_add_pixels_clamped_c(const int16_t *block, uint8_t *av_restrict pixels, | 94 | void ff_add_pixels_clamped_c(const int16_t *block, uint8_t *restrict pixels, |
| 97 | ptrdiff_t line_size); | 95 | ptrdiff_t line_size); |
| 98 | 96 | ||
| 99 | void ff_idctdsp_init(IDCTDSPContext *c, struct AVCodecContext *avctx); | 97 | void ff_idctdsp_init(IDCTDSPContext *c, struct AVCodecContext *avctx); |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | |||
| 23 | #include "libavutil/loongarch/loongson_intrinsics.h" | 23 | #include "libavutil/loongarch/loongson_intrinsics.h" |
| 24 | 24 | ||
| 25 | void ff_put_pixels_clamped_lasx(const int16_t *block, | 25 | void ff_put_pixels_clamped_lasx(const int16_t *block, |
| 26 | uint8_t *av_restrict pixels, | 26 | uint8_t *restrict pixels, |
| 27 | ptrdiff_t stride) | 27 | ptrdiff_t stride) |
| 28 | { | 28 | { |
| 29 | __m256i b0, b1, b2, b3; | 29 | __m256i b0, b1, b2, b3; |
| @@ -48,7 +48,7 @@ void ff_put_pixels_clamped_lasx(const int16_t *block, · 18 unmodified lines | |||
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | void ff_put_signed_pixels_clamped_lasx(const int16_t *block, | 50 | void ff_put_signed_pixels_clamped_lasx(const int16_t *block, |
| 51 | uint8_t *av_restrict pixels, | 51 | uint8_t *restrict pixels, |
| 52 | ptrdiff_t stride) | 52 | ptrdiff_t stride) |
| 53 | { | 53 | { |
| 54 | __m256i b0, b1, b2, b3; | 54 | __m256i b0, b1, b2, b3; |
| @@ -77,7 +77,7 @@ void ff_put_signed_pixels_clamped_lasx(const int16_t *block, · 22 unmodified lines | |||
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | void ff_add_pixels_clamped_lasx(const int16_t *block, | 79 | void ff_add_pixels_clamped_lasx(const int16_t *block, |
| 80 | uint8_t *av_restrict pixels, | 80 | uint8_t *restrict pixels, |
| 81 | ptrdiff_t stride) | 81 | ptrdiff_t stride) |
| 82 | { | 82 | { |
| 83 | __m256i b0, b1, b2, b3; | 83 | __m256i b0, b1, b2, b3; |
| @@ -29,13 +29,13 @@ void ff_simple_idct_lasx(int16_t *block); · 28 unmodified lines | |||
| 29 | void ff_simple_idct_put_lasx(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block); | 29 | void ff_simple_idct_put_lasx(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block); |
| 30 | void ff_simple_idct_add_lasx(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block); | 30 | void ff_simple_idct_add_lasx(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block); |
| 31 | void ff_put_pixels_clamped_lasx(const int16_t *block, | 31 | void ff_put_pixels_clamped_lasx(const int16_t *block, |
| 32 | uint8_t *av_restrict pixels, | 32 | uint8_t *restrict pixels, |
| 33 | ptrdiff_t line_size); | 33 | ptrdiff_t line_size); |
| 34 | void ff_put_signed_pixels_clamped_lasx(const int16_t *block, | 34 | void ff_put_signed_pixels_clamped_lasx(const int16_t *block, |
| 35 | uint8_t *av_restrict pixels, | 35 | uint8_t *restrict pixels, |
| 36 | ptrdiff_t line_size); | 36 | ptrdiff_t line_size); |
| 37 | void ff_add_pixels_clamped_lasx(const int16_t *block, | 37 | void ff_add_pixels_clamped_lasx(const int16_t *block, |
| 38 | uint8_t *av_restrict pixels, | 38 | uint8_t *restrict pixels, |
| 39 | ptrdiff_t line_size); | 39 | ptrdiff_t line_size); |
| 40 | 40 | ||
| 41 | #endif /* AVCODEC_LOONGARCH_IDCTDSP_LOONGARCH_H */ | 41 | #endif /* AVCODEC_LOONGARCH_IDCTDSP_LOONGARCH_H */ |
| @@ -25,13 +25,13 @@ · 24 unmodified lines | |||
| 25 | #include "../mpegvideo.h" | 25 | #include "../mpegvideo.h" |
| 26 | 26 | ||
| 27 | void ff_put_pixels_clamped_msa(const int16_t *block, | 27 | void ff_put_pixels_clamped_msa(const int16_t *block, |
| 28 | uint8_t *av_restrict pixels, | 28 | uint8_t *restrict pixels, |
| 29 | ptrdiff_t line_size); | 29 | ptrdiff_t line_size); |
| 30 | void ff_put_signed_pixels_clamped_msa(const int16_t *block, | 30 | void ff_put_signed_pixels_clamped_msa(const int16_t *block, |
| 31 | uint8_t *av_restrict pixels, | 31 | uint8_t *restrict pixels, |
| 32 | ptrdiff_t line_size); | 32 | ptrdiff_t line_size); |
| 33 | void ff_add_pixels_clamped_msa(const int16_t *block, | 33 | void ff_add_pixels_clamped_msa(const int16_t *block, |
| 34 | uint8_t *av_restrict pixels, | 34 | uint8_t *restrict pixels, |
| 35 | ptrdiff_t line_size); | 35 | ptrdiff_t line_size); |
| 36 | void ff_j_rev_dct_msa(int16_t *data); | 36 | void ff_j_rev_dct_msa(int16_t *data); |
| 37 | void ff_jref_idct_put_msa(uint8_t *dest, ptrdiff_t stride, int16_t *block); | 37 | void ff_jref_idct_put_msa(uint8_t *dest, ptrdiff_t stride, int16_t *block); |
| @@ -41,11 +41,11 @@ void ff_simple_idct_put_msa(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block) · 3 unmodified lines | |||
| 41 | void ff_simple_idct_add_msa(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block); | 41 | void ff_simple_idct_add_msa(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block); |
| 42 | 42 | ||
| 43 | void ff_put_pixels_clamped_mmi(const int16_t *block, | 43 | void ff_put_pixels_clamped_mmi(const int16_t *block, |
| 44 | uint8_t *av_restrict pixels, ptrdiff_t line_size); | 44 | uint8_t *restrict pixels, ptrdiff_t line_size); |
| 45 | void ff_put_signed_pixels_clamped_mmi(const int16_t *block, | 45 | void ff_put_signed_pixels_clamped_mmi(const int16_t *block, |
| 46 | uint8_t *av_restrict pixels, ptrdiff_t line_size); | 46 | uint8_t *restrict pixels, ptrdiff_t line_size); |
| 47 | void ff_add_pixels_clamped_mmi(const int16_t *block, | 47 | void ff_add_pixels_clamped_mmi(const int16_t *block, |
| 48 | uint8_t *av_restrict pixels, ptrdiff_t line_size); | 48 | uint8_t *restrict pixels, ptrdiff_t line_size); |
| 49 | void ff_simple_idct_8_mmi(int16_t *block); | 49 | void ff_simple_idct_8_mmi(int16_t *block); |
| 50 | void ff_simple_idct_put_8_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block); | 50 | void ff_simple_idct_put_8_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block); |
| 51 | void ff_simple_idct_add_8_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block); | 51 | void ff_simple_idct_add_8_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block); |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | |||
| 26 | #include "libavutil/mips/mmiutils.h" | 26 | #include "libavutil/mips/mmiutils.h" |
| 27 | 27 | ||
| 28 | void ff_put_pixels_clamped_mmi(const int16_t *block, | 28 | void ff_put_pixels_clamped_mmi(const int16_t *block, |
| 29 | uint8_t *av_restrict pixels, ptrdiff_t line_size) | 29 | uint8_t *restrict pixels, ptrdiff_t line_size) |
| 30 | { | 30 | { |
| 31 | double ftmp[8]; | 31 | double ftmp[8]; |
| 32 | 32 | ||
| @@ -83,7 +83,7 @@ void ff_put_pixels_clamped_mmi(const int16_t *block, · 50 unmodified lines | |||
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | void ff_put_signed_pixels_clamped_mmi(const int16_t *block, | 85 | void ff_put_signed_pixels_clamped_mmi(const int16_t *block, |
| 86 | uint8_t *av_restrict pixels, ptrdiff_t line_size) | 86 | uint8_t *restrict pixels, ptrdiff_t line_size) |
| 87 | { | 87 | { |
| 88 | double ftmp[5]; | 88 | double ftmp[5]; |
| 89 | 89 | ||
| @@ -148,7 +148,7 @@ void ff_put_signed_pixels_clamped_mmi(const int16_t *block, · 58 unmodified lines | |||
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | void ff_add_pixels_clamped_mmi(const int16_t *block, | 150 | void ff_add_pixels_clamped_mmi(const int16_t *block, |
| 151 | uint8_t *av_restrict pixels, ptrdiff_t line_size) | 151 | uint8_t *restrict pixels, ptrdiff_t line_size) |
| 152 | { | 152 | { |
| 153 | double ftmp[9]; | 153 | double ftmp[9]; |
| 154 | uint64_t tmp[1]; | 154 | uint64_t tmp[1]; |
| @@ -125,21 +125,21 @@ static void add_pixels_clamped_msa(const int16_t *block, uint8_t *pixels, · 124 unmodified lines | |||
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | void ff_put_pixels_clamped_msa(const int16_t *block, | 127 | void ff_put_pixels_clamped_msa(const int16_t *block, |
| 128 | uint8_t *av_restrict pixels, | 128 | uint8_t *restrict pixels, |
| 129 | ptrdiff_t line_size) | 129 | ptrdiff_t line_size) |
| 130 | { | 130 | { |
| 131 | put_pixels_clamped_msa(block, pixels, line_size); | 131 | put_pixels_clamped_msa(block, pixels, line_size); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | void ff_put_signed_pixels_clamped_msa(const int16_t *block, | 134 | void ff_put_signed_pixels_clamped_msa(const int16_t *block, |
| 135 | uint8_t *av_restrict pixels, | 135 | uint8_t *restrict pixels, |
| 136 | ptrdiff_t line_size) | 136 | ptrdiff_t line_size) |
| 137 | { | 137 | { |
| 138 | put_signed_pixels_clamped_msa(block, pixels, line_size); | 138 | put_signed_pixels_clamped_msa(block, pixels, line_size); |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | void ff_add_pixels_clamped_msa(const int16_t *block, | 141 | void ff_add_pixels_clamped_msa(const int16_t *block, |
| 142 | uint8_t *av_restrict pixels, | 142 | uint8_t *restrict pixels, |
| 143 | ptrdiff_t line_size) | 143 | ptrdiff_t line_size) |
| 144 | { | 144 | { |
| 145 | add_pixels_clamped_msa(block, pixels, line_size); | 145 | add_pixels_clamped_msa(block, pixels, line_size); |
| @@ -54,7 +54,7 @@ int ff_sse8_msa(MpegEncContext *v, const uint8_t *pu8Src, const uint8_t *pu8Ref, · 53 unmodified lines | |||
| 54 | ptrdiff_t stride, int i32Height); | 54 | ptrdiff_t stride, int i32Height); |
| 55 | int ff_sse4_msa(MpegEncContext *v, const uint8_t *pu8Src, const uint8_t *pu8Ref, | 55 | int ff_sse4_msa(MpegEncContext *v, const uint8_t *pu8Src, const uint8_t *pu8Ref, |
| 56 | ptrdiff_t stride, int i32Height); | 56 | ptrdiff_t stride, int i32Height); |
| 57 | void ff_add_pixels8_msa(const uint8_t *av_restrict pixels, int16_t *block, | 57 | void ff_add_pixels8_msa(const uint8_t *restrict pixels, int16_t *block, |
| 58 | ptrdiff_t stride); | 58 | ptrdiff_t stride); |
| 59 | 59 | ||
| 60 | #endif // #ifndef AVCODEC_MIPS_ME_CMP_MIPS_H | 60 | #endif // #ifndef AVCODEC_MIPS_ME_CMP_MIPS_H |
| @@ -24,16 +24,16 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "../mpegvideo.h" | 25 | #include "../mpegvideo.h" |
| 26 | 26 | ||
| 27 | void ff_diff_pixels_msa(int16_t *av_restrict block, const uint8_t *src1, | 27 | void ff_diff_pixels_msa(int16_t *restrict block, const uint8_t *src1, |
| 28 | const uint8_t *src2, ptrdiff_t stride); | 28 | const uint8_t *src2, ptrdiff_t stride); |
| 29 | void ff_get_pixels_16_msa(int16_t *restrict dst, const uint8_t *src, | 29 | void ff_get_pixels_16_msa(int16_t *restrict dst, const uint8_t *src, |
| 30 | ptrdiff_t stride); | 30 | ptrdiff_t stride); |
| 31 | void ff_get_pixels_8_msa(int16_t *restrict dst, const uint8_t *src, | 31 | void ff_get_pixels_8_msa(int16_t *restrict dst, const uint8_t *src, |
| 32 | ptrdiff_t stride); | 32 | ptrdiff_t stride); |
| 33 | 33 | ||
| 34 | void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels, | 34 | void ff_get_pixels_8_mmi(int16_t *restrict block, const uint8_t *pixels, |
| 35 | ptrdiff_t stride); | 35 | ptrdiff_t stride); |
| 36 | void ff_diff_pixels_mmi(int16_t *av_restrict block, const uint8_t *src1, | 36 | void ff_diff_pixels_mmi(int16_t *restrict block, const uint8_t *src1, |
| 37 | const uint8_t *src2, ptrdiff_t stride); | 37 | const uint8_t *src2, ptrdiff_t stride); |
| 38 | 38 | ||
| 39 | #endif // #ifndef AVCODEC_MIPS_PIXBLOCKDSP_MIPS_H | 39 | #endif // #ifndef AVCODEC_MIPS_PIXBLOCKDSP_MIPS_H |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "libavutil/mips/asmdefs.h" | 25 | #include "libavutil/mips/asmdefs.h" |
| 26 | #include "libavutil/mips/mmiutils.h" | 26 | #include "libavutil/mips/mmiutils.h" |
| 27 | 27 | ||
| 28 | void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels, | 28 | void ff_get_pixels_8_mmi(int16_t *restrict block, const uint8_t *pixels, |
| 29 | ptrdiff_t stride) | 29 | ptrdiff_t stride) |
| 30 | { | 30 | { |
| 31 | double ftmp[7]; | 31 | double ftmp[7]; |
| @@ -94,7 +94,7 @@ void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels, · 62 unmodified lines | |||
| 94 | ); | 94 | ); |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | void ff_diff_pixels_mmi(int16_t *av_restrict block, const uint8_t *src1, | 97 | void ff_diff_pixels_mmi(int16_t *restrict block, const uint8_t *src1, |
| 98 | const uint8_t *src2, ptrdiff_t stride) | 98 | const uint8_t *src2, ptrdiff_t stride) |
| 99 | { | 99 | { |
| 100 | double ftmp[5]; | 100 | double ftmp[5]; |
| @@ -124,19 +124,19 @@ static void copy_width16_msa(const uint8_t *src, int32_t src_stride, · 123 unmodified lines | |||
| 124 | } | 124 | } |
| 125 | } | 125 | } |
| 126 | 126 | ||
| 127 | void ff_get_pixels_16_msa(int16_t *av_restrict dest, const uint8_t *src, | 127 | void ff_get_pixels_16_msa(int16_t *restrict dest, const uint8_t *src, |
| 128 | ptrdiff_t stride) | 128 | ptrdiff_t stride) |
| 129 | { | 129 | { |
| 130 | copy_width16_msa(src, stride, (uint8_t *) dest, 16, 8); | 130 | copy_width16_msa(src, stride, (uint8_t *) dest, 16, 8); |
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | void ff_get_pixels_8_msa(int16_t *av_restrict dest, const uint8_t *src, | 133 | void ff_get_pixels_8_msa(int16_t *restrict dest, const uint8_t *src, |
| 134 | ptrdiff_t stride) | 134 | ptrdiff_t stride) |
| 135 | { | 135 | { |
| 136 | copy_8bit_to_16bit_width8_msa(src, stride, dest, 8, 8); | 136 | copy_8bit_to_16bit_width8_msa(src, stride, dest, 8, 8); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | void ff_diff_pixels_msa(int16_t *av_restrict block, const uint8_t *src1, | 139 | void ff_diff_pixels_msa(int16_t *restrict block, const uint8_t *src1, |
| 140 | const uint8_t *src2, ptrdiff_t stride) | 140 | const uint8_t *src2, ptrdiff_t stride) |
| 141 | { | 141 | { |
| 142 | diff_pixels_msa(block, src1, src2, stride); | 142 | diff_pixels_msa(block, src1, src2, stride); |
| @@ -92,7 +92,7 @@ typedef struct MPADecodeContext { · 91 unmodified lines | |||
| 92 | int err_recognition; | 92 | int err_recognition; |
| 93 | AVCodecContext* avctx; | 93 | AVCodecContext* avctx; |
| 94 | MPADSPContext mpadsp; | 94 | MPADSPContext mpadsp; |
| 95 | void (*butterflies_float)(float *av_restrict v1, float *av_restrict v2, int len); | 95 | void (*butterflies_float)(float *restrict v1, float *restrict v2, int len); |
| 96 | AVFrame *frame; | 96 | AVFrame *frame; |
| 97 | uint32_t crc; | 97 | uint32_t crc; |
| 98 | } MPADecodeContext; | 98 | } MPADecodeContext; |
| @@ -80,7 +80,7 @@ static inline int celt_pulses2bits(const uint8_t *cache, int pulses) · 79 unmodified lines | |||
| 80 | return (pulses == 0) ? 0 : cache[pulses] + 1; | 80 | return (pulses == 0) ? 0 : cache[pulses] + 1; |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | static inline void celt_normalize_residual(const int * av_restrict iy, float * av_restrict X, | 83 | static inline void celt_normalize_residual(const int * restrict iy, float * restrict X, |
| 84 | int N, float g) | 84 | int N, float g) |
| 85 | { | 85 | { |
| 86 | int i; | 86 | int i; |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | |||
| 24 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 25 | #include "pixblockdsp.h" | 25 | #include "pixblockdsp.h" |
| 26 | 26 | ||
| 27 | static void get_pixels_16_c(int16_t *av_restrict block, const uint8_t *pixels, | 27 | static void get_pixels_16_c(int16_t *restrict block, const uint8_t *pixels, |
| 28 | ptrdiff_t stride) | 28 | ptrdiff_t stride) |
| 29 | { | 29 | { |
| 30 | AV_COPY128U(block + 0 * 8, pixels + 0 * stride); | 30 | AV_COPY128U(block + 0 * 8, pixels + 0 * stride); |
| @@ -37,7 +37,7 @@ static void get_pixels_16_c(int16_t *av_restrict block, const uint8_t *pixels, · 6 unmodified lines | |||
| 37 | AV_COPY128U(block + 7 * 8, pixels + 7 * stride); | 37 | AV_COPY128U(block + 7 * 8, pixels + 7 * stride); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | static void get_pixels_8_c(int16_t *av_restrict block, const uint8_t *pixels, | 40 | static void get_pixels_8_c(int16_t *restrict block, const uint8_t *pixels, |
| 41 | ptrdiff_t stride) | 41 | ptrdiff_t stride) |
| 42 | { | 42 | { |
| 43 | int i; | 43 | int i; |
| @@ -57,7 +57,7 @@ static void get_pixels_8_c(int16_t *av_restrict block, const uint8_t *pixels, · 13 unmodified lines | |||
| 57 | } | 57 | } |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | static void diff_pixels_c(int16_t *av_restrict block, const uint8_t *s1, | 60 | static void diff_pixels_c(int16_t *restrict block, const uint8_t *s1, |
| 61 | const uint8_t *s2, ptrdiff_t stride) | 61 | const uint8_t *s2, ptrdiff_t stride) |
| 62 | { | 62 | { |
| 63 | int i; | 63 | int i; |
| @@ -21,22 +21,20 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include <stdint.h> | 22 | #include <stdint.h> |
| 23 | 23 | ||
| 24 | #include "config.h" | ||
| 25 | |||
| 26 | #include "avcodec.h" | 24 | #include "avcodec.h" |
| 27 | 25 | ||
| 28 | typedef struct PixblockDSPContext { | 26 | typedef struct PixblockDSPContext { |
| 29 | void (*get_pixels)(int16_t *av_restrict block /* align 16 */, | 27 | void (*get_pixels)(int16_t *restrict block /* align 16 */, |
| 30 | const uint8_t *pixels /* align 8 */, | 28 | const uint8_t *pixels /* align 8 */, |
| 31 | ptrdiff_t stride); | 29 | ptrdiff_t stride); |
| 32 | void (*get_pixels_unaligned)(int16_t *av_restrict block /* align 16 */, | 30 | void (*get_pixels_unaligned)(int16_t *restrict block /* align 16 */, |
| 33 | const uint8_t *pixels, | 31 | const uint8_t *pixels, |
| 34 | ptrdiff_t stride); | 32 | ptrdiff_t stride); |
| 35 | void (*diff_pixels)(int16_t *av_restrict block /* align 16 */, | 33 | void (*diff_pixels)(int16_t *restrict block /* align 16 */, |
| 36 | const uint8_t *s1 /* align 8 */, | 34 | const uint8_t *s1 /* align 8 */, |
| 37 | const uint8_t *s2 /* align 8 */, | 35 | const uint8_t *s2 /* align 8 */, |
| 38 | ptrdiff_t stride); | 36 | ptrdiff_t stride); |
| 39 | void (*diff_pixels_unaligned)(int16_t *av_restrict block /* align 16 */, | 37 | void (*diff_pixels_unaligned)(int16_t *restrict block /* align 16 */, |
| 40 | const uint8_t *s1, | 38 | const uint8_t *s1, |
| 41 | const uint8_t *s2, | 39 | const uint8_t *s2, |
| 42 | ptrdiff_t stride); | 40 | ptrdiff_t stride); |
| @@ -939,9 +939,9 @@ void ff_thread_report_progress2(AVCodecContext *avctx, int field, int thread, in · 938 unmodified lines | |||
| 939 | 939 | ||
| 940 | #endif | 940 | #endif |
| 941 | 941 | ||
| 942 | const uint8_t *avpriv_find_start_code(const uint8_t *av_restrict p, | 942 | const uint8_t *avpriv_find_start_code(const uint8_t *restrict p, |
| 943 | const uint8_t *end, | 943 | const uint8_t *end, |
| 944 | uint32_t *av_restrict state) | 944 | uint32_t *restrict state) |
| 945 | { | 945 | { |
| 946 | int i; | 946 | int i; |
| 947 | 947 | ||