Unified · Split
| @@ -72,7 +72,6 @@ static void check_output_yuv2gbrp(void) · 71 unmodified lines | ||
| 72 | 72 | #define FILTER_SIZES 4 |
| 73 | 73 | static const int filter_sizes[] = {1, 4, 8, 16}; |
| 74 | 74 | #define LARGEST_INPUT_SIZE 512 |
| 75 | −#define INPUT_SIZES 6 | |
| 76 | 75 | static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; |
| 77 | 76 | uint8_t *dst0[4]; |
| 78 | 77 | uint8_t *dst1[4]; |
| @@ -140,7 +139,7 @@ static void check_output_yuv2gbrp(void) · 61 unmodified lines | ||
| 140 | 139 | |
| 141 | 140 | for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { |
| 142 | 141 | for (fsi = 0; fsi < FILTER_SIZES; fsi++) { |
| 143 | − for (isi = 0; isi < INPUT_SIZES; isi++ ) { | |
| 142 | + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { | |
| 144 | 143 | desc = av_pix_fmt_desc_get(planar_fmts[fmi]); |
| 145 | 144 | c->dstFormat = planar_fmts[fmi]; |
| 146 | 145 | |
| @@ -187,7 +186,6 @@ static void check_output_yuv2gbrp(void) · 40 unmodified lines | ||
| 187 | 186 | } |
| 188 | 187 | |
| 189 | 188 | #undef LARGEST_INPUT_SIZE |
| 190 | −#undef INPUT_SIZES | |
| 191 | 189 | |
| 192 | 190 | static void check_input_planar_rgb_to_y(void) |
| 193 | 191 | { |
| @@ -197,7 +195,6 @@ static void check_input_planar_rgb_to_y(void) · 3 unmodified lines | ||
| 197 | 195 | int fmi, isi; |
| 198 | 196 | int dstW, byte_size; |
| 199 | 197 | #define LARGEST_INPUT_SIZE 512 |
| 200 | −#define INPUT_SIZES 6 | |
| 201 | 198 | static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; |
| 202 | 199 | const uint8_t *src[4]; |
| 203 | 200 | int32_t rgb2yuv[9] = {0}; |
| @@ -230,7 +227,7 @@ static void check_input_planar_rgb_to_y(void) · 26 unmodified lines | ||
| 230 | 227 | |
| 231 | 228 | c = sws_internal(sws); |
| 232 | 229 | for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { |
| 233 | − for (isi = 0; isi < INPUT_SIZES; isi++ ) { | |
| 230 | + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { | |
| 234 | 231 | desc = av_pix_fmt_desc_get(planar_fmts[fmi]); |
| 235 | 232 | c->srcFormat = planar_fmts[fmi]; |
| 236 | 233 | c->dstFormat = AV_PIX_FMT_YUVA444P16; |
| @@ -257,7 +254,6 @@ static void check_input_planar_rgb_to_y(void) · 20 unmodified lines | ||
| 257 | 254 | } |
| 258 | 255 | |
| 259 | 256 | #undef LARGEST_INPUT_SIZE |
| 260 | −#undef INPUT_SIZES | |
| 261 | 257 | |
| 262 | 258 | static void check_input_planar_rgb_to_uv(void) |
| 263 | 259 | { |
| @@ -267,7 +263,6 @@ static void check_input_planar_rgb_to_uv(void) · 3 unmodified lines | ||
| 267 | 263 | int fmi, isi; |
| 268 | 264 | int dstW, byte_size; |
| 269 | 265 | #define LARGEST_INPUT_SIZE 512 |
| 270 | −#define INPUT_SIZES 6 | |
| 271 | 266 | static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; |
| 272 | 267 | const uint8_t *src[4]; |
| 273 | 268 | int32_t rgb2yuv[9] = {0}; |
| @@ -303,7 +298,7 @@ static void check_input_planar_rgb_to_uv(void) · 29 unmodified lines | ||
| 303 | 298 | |
| 304 | 299 | c = sws_internal(sws); |
| 305 | 300 | for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { |
| 306 | − for (isi = 0; isi < INPUT_SIZES; isi++ ) { | |
| 301 | + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { | |
| 307 | 302 | desc = av_pix_fmt_desc_get(planar_fmts[fmi]); |
| 308 | 303 | c->srcFormat = planar_fmts[fmi]; |
| 309 | 304 | c->dstFormat = AV_PIX_FMT_YUVA444P16; |
| @@ -332,7 +327,6 @@ static void check_input_planar_rgb_to_uv(void) · 22 unmodified lines | ||
| 332 | 327 | } |
| 333 | 328 | |
| 334 | 329 | #undef LARGEST_INPUT_SIZE |
| 335 | −#undef INPUT_SIZES | |
| 336 | 330 | |
| 337 | 331 | static void check_input_planar_rgb_to_a(void) |
| 338 | 332 | { |
| @@ -342,7 +336,6 @@ static void check_input_planar_rgb_to_a(void) · 3 unmodified lines | ||
| 342 | 336 | int fmi, isi; |
| 343 | 337 | int dstW, byte_size; |
| 344 | 338 | #define LARGEST_INPUT_SIZE 512 |
| 345 | −#define INPUT_SIZES 6 | |
| 346 | 339 | static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; |
| 347 | 340 | const uint8_t *src[4]; |
| 348 | 341 | int32_t rgb2yuv[9] = {0}; |
| @@ -375,7 +368,7 @@ static void check_input_planar_rgb_to_a(void) · 26 unmodified lines | ||
| 375 | 368 | |
| 376 | 369 | c = sws_internal(sws); |
| 377 | 370 | for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) { |
| 378 | − for (isi = 0; isi < INPUT_SIZES; isi++ ) { | |
| 371 | + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); isi++ ) { | |
| 379 | 372 | desc = av_pix_fmt_desc_get(planar_fmts[fmi]); |
| 380 | 373 | if (!(desc->flags & AV_PIX_FMT_FLAG_ALPHA)) |
| 381 | 374 | continue; |
| @@ -32,7 +32,6 @@ static void check_lumConvertRange(int from) · 31 unmodified lines | ||
| 32 | 32 | { |
| 33 | 33 | const char *func_str = from ? "lumRangeFromJpeg" : "lumRangeToJpeg"; |
| 34 | 34 | #define LARGEST_INPUT_SIZE 512 |
| 35 | −#define INPUT_SIZES 6 | |
| 36 | 35 | static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; |
| 37 | 36 | SwsContext *sws; |
| 38 | 37 | SwsInternal *c; |
| @@ -52,7 +51,7 @@ static void check_lumConvertRange(int from) · 13 unmodified lines | ||
| 52 | 51 | c->srcRange = from; |
| 53 | 52 | c->dstRange = !from; |
| 54 | 53 | |
| 55 | − for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) { | |
| 54 | + for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { | |
| 56 | 55 | int width = input_sizes[dstWi]; |
| 57 | 56 | for (int i = 0; i < width; i++) { |
| 58 | 57 | uint8_t r = rnd(); |
| @@ -72,13 +71,11 @@ static void check_lumConvertRange(int from) · 13 unmodified lines | ||
| 72 | 71 | sws_freeContext(sws); |
| 73 | 72 | } |
| 74 | 73 | #undef LARGEST_INPUT_SIZE |
| 75 | −#undef INPUT_SIZES | |
| 76 | 74 | |
| 77 | 75 | static void check_chrConvertRange(int from) |
| 78 | 76 | { |
| 79 | 77 | const char *func_str = from ? "chrRangeFromJpeg" : "chrRangeToJpeg"; |
| 80 | 78 | #define LARGEST_INPUT_SIZE 512 |
| 81 | −#define INPUT_SIZES 6 | |
| 82 | 79 | static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; |
| 83 | 80 | SwsContext *sws; |
| 84 | 81 | SwsInternal *c; |
| @@ -100,7 +97,7 @@ static void check_chrConvertRange(int from) · 15 unmodified lines | ||
| 100 | 97 | c->srcRange = from; |
| 101 | 98 | c->dstRange = !from; |
| 102 | 99 | |
| 103 | − for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) { | |
| 100 | + for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { | |
| 104 | 101 | int width = input_sizes[dstWi]; |
| 105 | 102 | for (int i = 0; i < width; i++) { |
| 106 | 103 | uint8_t r = rnd(); |
| @@ -123,7 +120,6 @@ static void check_chrConvertRange(int from) · 16 unmodified lines | ||
| 123 | 120 | sws_freeContext(sws); |
| 124 | 121 | } |
| 125 | 122 | #undef LARGEST_INPUT_SIZE |
| 126 | −#undef INPUT_SIZES | |
| 127 | 123 | |
| 128 | 124 | void checkasm_check_sw_range_convert(void) |
| 129 | 125 | { |
| @@ -105,7 +105,6 @@ static void check_yuv2yuv1(int accurate) · 104 unmodified lines | ||
| 105 | 105 | int dstW, offset; |
| 106 | 106 | size_t fail_offset; |
| 107 | 107 | const int input_sizes[] = {8, 24, 128, 144, 256, 512}; |
| 108 | − const int INPUT_SIZES = sizeof(input_sizes)/sizeof(input_sizes[0]); | |
| 109 | 108 | #define LARGEST_INPUT_SIZE 512 |
| 110 | 109 | |
| 111 | 110 | const int offsets[] = {0, 3, 8, 11, 16, 19}; |
| @@ -131,7 +130,7 @@ static void check_yuv2yuv1(int accurate) · 19 unmodified lines | ||
| 131 | 130 | fail(); |
| 132 | 131 | |
| 133 | 132 | ff_sws_init_scale(c); |
| 134 | − for (isi = 0; isi < INPUT_SIZES; ++isi) { | |
| 133 | + for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); ++isi) { | |
| 135 | 134 | dstW = input_sizes[isi]; |
| 136 | 135 | for (osi = 0; osi < OFFSET_SIZES; osi++) { |
| 137 | 136 | offset = offsets[osi]; |
| @@ -171,7 +170,6 @@ static void check_yuv2yuvX(int accurate) · 33 unmodified lines | ||
| 171 | 170 | const int FILTER_SIZES = sizeof(filter_sizes)/sizeof(filter_sizes[0]); |
| 172 | 171 | #define LARGEST_INPUT_SIZE 512 |
| 173 | 172 | static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; |
| 174 | − const int INPUT_SIZES = sizeof(input_sizes)/sizeof(input_sizes[0]); | |
| 175 | 173 | const char *accurate_str = (accurate) ? "accurate" : "approximate"; |
| 176 | 174 | |
| 177 | 175 | declare_func_emms(AV_CPU_FLAG_MMX, void, const int16_t *filter, |
| @@ -199,7 +197,7 @@ static void check_yuv2yuvX(int accurate) · 21 unmodified lines | ||
| 199 | 197 | fail(); |
| 200 | 198 | |
| 201 | 199 | ff_sws_init_scale(c); |
| 202 | − for(isi = 0; isi < INPUT_SIZES; ++isi){ | |
| 200 | + for(isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); ++isi){ | |
| 203 | 201 | dstW = input_sizes[isi]; |
| 204 | 202 | for(osi = 0; osi < 64; osi += 16){ |
| 205 | 203 | if (dstW <= osi) |
| @@ -274,8 +272,7 @@ static void check_hscale(void) · 68 unmodified lines | ||
| 274 | 272 | }; |
| 275 | 273 | |
| 276 | 274 | #define LARGEST_INPUT_SIZE 512 |
| 277 | −#define INPUT_SIZES 6 | |
| 278 | − static const int input_sizes[INPUT_SIZES] = {8, 24, 128, 144, 256, 512}; | |
| 275 | + static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; | |
| 279 | 276 | |
| 280 | 277 | int i, j, fsi, hpi, width, dstWi; |
| 281 | 278 | SwsContext *sws; |
| @@ -307,7 +304,7 @@ static void check_hscale(void) · 25 unmodified lines | ||
| 307 | 304 | |
| 308 | 305 | for (hpi = 0; hpi < HSCALE_PAIRS; hpi++) { |
| 309 | 306 | for (fsi = 0; fsi < FILTER_SIZES; fsi++) { |
| 310 | − for (dstWi = 0; dstWi < INPUT_SIZES; dstWi++) { | |
| 307 | + for (dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { | |
| 311 | 308 | width = filter_sizes[fsi]; |
| 312 | 309 | |
| 313 | 310 | c->srcBpc = hscale_pairs[hpi][0]; |