History

checkasm: use FF_ARRAY_ELEMS instead of hardcoding size of arrays

Ramiro Polla committed 2 years ago

Commit a8ef1fa1 parent 8b30dae3 files · +10 −24Browse files

Unified · Split

3 files
  1. tests/checkasm/sw_gbrp.c +4 −11
  2. tests/checkasm/sw_range_convert.c +2 −6
  3. tests/checkasm/sw_scale.c +4 −7
tests/checkasm/sw_gbrp.c+4−11
@@ -72,7 +72,6 @@ static void check_output_yuv2gbrp(void) · 71 unmodified lines
7272 #define FILTER_SIZES 4
7373 static const int filter_sizes[] = {1, 4, 8, 16};
7474 #define LARGEST_INPUT_SIZE 512
75−#define INPUT_SIZES 6
7675 static const int input_sizes[] = {8, 24, 128, 144, 256, 512};
7776 uint8_t *dst0[4];
7877 uint8_t *dst1[4];
@@ -140,7 +139,7 @@ static void check_output_yuv2gbrp(void) · 61 unmodified lines
140139
141140 for (fmi = 0; fmi < FF_ARRAY_ELEMS(planar_fmts); fmi++) {
142141 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++ ) {
144143 desc = av_pix_fmt_desc_get(planar_fmts[fmi]);
145144 c->dstFormat = planar_fmts[fmi];
146145
@@ -187,7 +186,6 @@ static void check_output_yuv2gbrp(void) · 40 unmodified lines
187186 }
188187
189188 #undef LARGEST_INPUT_SIZE
190−#undef INPUT_SIZES
191189
192190 static void check_input_planar_rgb_to_y(void)
193191 {
@@ -197,7 +195,6 @@ static void check_input_planar_rgb_to_y(void) · 3 unmodified lines
197195 int fmi, isi;
198196 int dstW, byte_size;
199197 #define LARGEST_INPUT_SIZE 512
200−#define INPUT_SIZES 6
201198 static const int input_sizes[] = {8, 24, 128, 144, 256, 512};
202199 const uint8_t *src[4];
203200 int32_t rgb2yuv[9] = {0};
@@ -230,7 +227,7 @@ static void check_input_planar_rgb_to_y(void) · 26 unmodified lines
230227
231228 c = sws_internal(sws);
232229 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++ ) {
234231 desc = av_pix_fmt_desc_get(planar_fmts[fmi]);
235232 c->srcFormat = planar_fmts[fmi];
236233 c->dstFormat = AV_PIX_FMT_YUVA444P16;
@@ -257,7 +254,6 @@ static void check_input_planar_rgb_to_y(void) · 20 unmodified lines
257254 }
258255
259256 #undef LARGEST_INPUT_SIZE
260−#undef INPUT_SIZES
261257
262258 static void check_input_planar_rgb_to_uv(void)
263259 {
@@ -267,7 +263,6 @@ static void check_input_planar_rgb_to_uv(void) · 3 unmodified lines
267263 int fmi, isi;
268264 int dstW, byte_size;
269265 #define LARGEST_INPUT_SIZE 512
270−#define INPUT_SIZES 6
271266 static const int input_sizes[] = {8, 24, 128, 144, 256, 512};
272267 const uint8_t *src[4];
273268 int32_t rgb2yuv[9] = {0};
@@ -303,7 +298,7 @@ static void check_input_planar_rgb_to_uv(void) · 29 unmodified lines
303298
304299 c = sws_internal(sws);
305300 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++ ) {
307302 desc = av_pix_fmt_desc_get(planar_fmts[fmi]);
308303 c->srcFormat = planar_fmts[fmi];
309304 c->dstFormat = AV_PIX_FMT_YUVA444P16;
@@ -332,7 +327,6 @@ static void check_input_planar_rgb_to_uv(void) · 22 unmodified lines
332327 }
333328
334329 #undef LARGEST_INPUT_SIZE
335−#undef INPUT_SIZES
336330
337331 static void check_input_planar_rgb_to_a(void)
338332 {
@@ -342,7 +336,6 @@ static void check_input_planar_rgb_to_a(void) · 3 unmodified lines
342336 int fmi, isi;
343337 int dstW, byte_size;
344338 #define LARGEST_INPUT_SIZE 512
345−#define INPUT_SIZES 6
346339 static const int input_sizes[] = {8, 24, 128, 144, 256, 512};
347340 const uint8_t *src[4];
348341 int32_t rgb2yuv[9] = {0};
@@ -375,7 +368,7 @@ static void check_input_planar_rgb_to_a(void) · 26 unmodified lines
375368
376369 c = sws_internal(sws);
377370 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++ ) {
379372 desc = av_pix_fmt_desc_get(planar_fmts[fmi]);
380373 if (!(desc->flags & AV_PIX_FMT_FLAG_ALPHA))
381374 continue;
tests/checkasm/sw_range_convert.c+2−6
@@ -32,7 +32,6 @@ static void check_lumConvertRange(int from) · 31 unmodified lines
3232 {
3333 const char *func_str = from ? "lumRangeFromJpeg" : "lumRangeToJpeg";
3434 #define LARGEST_INPUT_SIZE 512
35−#define INPUT_SIZES 6
3635 static const int input_sizes[] = {8, 24, 128, 144, 256, 512};
3736 SwsContext *sws;
3837 SwsInternal *c;
@@ -52,7 +51,7 @@ static void check_lumConvertRange(int from) · 13 unmodified lines
5251 c->srcRange = from;
5352 c->dstRange = !from;
5453
55− for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) {
54+ for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) {
5655 int width = input_sizes[dstWi];
5756 for (int i = 0; i < width; i++) {
5857 uint8_t r = rnd();
@@ -72,13 +71,11 @@ static void check_lumConvertRange(int from) · 13 unmodified lines
7271 sws_freeContext(sws);
7372 }
7473 #undef LARGEST_INPUT_SIZE
75−#undef INPUT_SIZES
7674
7775 static void check_chrConvertRange(int from)
7876 {
7977 const char *func_str = from ? "chrRangeFromJpeg" : "chrRangeToJpeg";
8078 #define LARGEST_INPUT_SIZE 512
81−#define INPUT_SIZES 6
8279 static const int input_sizes[] = {8, 24, 128, 144, 256, 512};
8380 SwsContext *sws;
8481 SwsInternal *c;
@@ -100,7 +97,7 @@ static void check_chrConvertRange(int from) · 15 unmodified lines
10097 c->srcRange = from;
10198 c->dstRange = !from;
10299
103− for (int dstWi = 0; dstWi < INPUT_SIZES; dstWi++) {
100+ for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) {
104101 int width = input_sizes[dstWi];
105102 for (int i = 0; i < width; i++) {
106103 uint8_t r = rnd();
@@ -123,7 +120,6 @@ static void check_chrConvertRange(int from) · 16 unmodified lines
123120 sws_freeContext(sws);
124121 }
125122 #undef LARGEST_INPUT_SIZE
126−#undef INPUT_SIZES
127123
128124 void checkasm_check_sw_range_convert(void)
129125 {
tests/checkasm/sw_scale.c+4−7
@@ -105,7 +105,6 @@ static void check_yuv2yuv1(int accurate) · 104 unmodified lines
105105 int dstW, offset;
106106 size_t fail_offset;
107107 const int input_sizes[] = {8, 24, 128, 144, 256, 512};
108− const int INPUT_SIZES = sizeof(input_sizes)/sizeof(input_sizes[0]);
109108 #define LARGEST_INPUT_SIZE 512
110109
111110 const int offsets[] = {0, 3, 8, 11, 16, 19};
@@ -131,7 +130,7 @@ static void check_yuv2yuv1(int accurate) · 19 unmodified lines
131130 fail();
132131
133132 ff_sws_init_scale(c);
134− for (isi = 0; isi < INPUT_SIZES; ++isi) {
133+ for (isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); ++isi) {
135134 dstW = input_sizes[isi];
136135 for (osi = 0; osi < OFFSET_SIZES; osi++) {
137136 offset = offsets[osi];
@@ -171,7 +170,6 @@ static void check_yuv2yuvX(int accurate) · 33 unmodified lines
171170 const int FILTER_SIZES = sizeof(filter_sizes)/sizeof(filter_sizes[0]);
172171 #define LARGEST_INPUT_SIZE 512
173172 static const int input_sizes[] = {8, 24, 128, 144, 256, 512};
174− const int INPUT_SIZES = sizeof(input_sizes)/sizeof(input_sizes[0]);
175173 const char *accurate_str = (accurate) ? "accurate" : "approximate";
176174
177175 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
199197 fail();
200198
201199 ff_sws_init_scale(c);
202− for(isi = 0; isi < INPUT_SIZES; ++isi){
200+ for(isi = 0; isi < FF_ARRAY_ELEMS(input_sizes); ++isi){
203201 dstW = input_sizes[isi];
204202 for(osi = 0; osi < 64; osi += 16){
205203 if (dstW <= osi)
@@ -274,8 +272,7 @@ static void check_hscale(void) · 68 unmodified lines
274272 };
275273
276274 #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};
279276
280277 int i, j, fsi, hpi, width, dstWi;
281278 SwsContext *sws;
@@ -307,7 +304,7 @@ static void check_hscale(void) · 25 unmodified lines
307304
308305 for (hpi = 0; hpi < HSCALE_PAIRS; hpi++) {
309306 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++) {
311308 width = filter_sizes[fsi];
312309
313310 c->srcBpc = hscale_pairs[hpi][0];

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t