From b481bbc32abd94e5dc1c1de731254a0fda2810ff Mon Sep 17 00:00:00 2001 From: Gaurav Narula Date: Wed, 18 Jan 2012 20:51:54 +0100 Subject: tests: K&R formatting cosmetics for test programs --- tests/videogen.c | 144 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 75 insertions(+), 69 deletions(-) (limited to 'tests/videogen.c') diff --git a/tests/videogen.c b/tests/videogen.c index 957692d307..1aad70031e 100644 --- a/tests/videogen.c +++ b/tests/videogen.c @@ -27,67 +27,73 @@ #define SCALEBITS 8 #define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1L<> SCALEBITS; - r = p[3]; - g = p[4]; - b = p[5]; - r1 += r; - g1 += g; - b1 += b; - lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + - FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - p += wrap3; - lum += wrap; - - r = p[0]; - g = p[1]; - b = p[2]; - r1 += r; - g1 += g; - b1 += b; - lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g + - FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - r = p[3]; - g = p[4]; - b = p[5]; - r1 += r; - g1 += g; - b1 += b; - lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + - FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - - cb[0] = ((- FIX(0.16874) * r1 - FIX(0.33126) * g1 + - FIX(0.50000) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128; - cr[0] = ((FIX(0.50000) * r1 - FIX(0.41869) * g1 - - FIX(0.08131) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128; + p = src; + for (y = 0; y < height; y += 2) { + for (x = 0; x < width; x += 2) { + r = p[0]; + g = p[1]; + b = p[2]; + r1 = r; + g1 = g; + b1 = b; + lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g + + FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; + r = p[3]; + g = p[4]; + b = p[5]; + r1 += r; + g1 += g; + b1 += b; + lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + + FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; + p += wrap3; + lum += wrap; + + r = p[0]; + g = p[1]; + b = p[2]; + r1 += r; + g1 += g; + b1 += b; + lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g + + FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; + r = p[3]; + g = p[4]; + b = p[5]; + r1 += r; + g1 += g; + b1 += b; + lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + + FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; + + cb[0] = 128 + ((- FIX(0.16874) * r1 - + FIX(0.33126) * g1 + + FIX(0.50000) * b1 + + 4 * ONE_HALF - 1) + >> (SCALEBITS + 2)); + cr[0] = 128 + ((FIX(0.50000) * r1 - + FIX(0.41869) * g1 - + FIX(0.08131) * b1 + + 4 * ONE_HALF - 1) + >> (SCALEBITS + 2)); cb++; cr++; - p += -wrap3 + 2 * 3; + p += -wrap3 + 2 * 3; lum += -wrap + 2; } - p += wrap3; + p += wrap3; lum += wrap; } } @@ -106,19 +112,19 @@ static void pgmyuv_save(const char *filename, int w, int h, unsigned char *lum_tab, *cb_tab, *cr_tab; lum_tab = malloc(w * h); - cb_tab = malloc((w * h) / 4); - cr_tab = malloc((w * h) / 4); + cb_tab = malloc((w * h) / 4); + cr_tab = malloc((w * h) / 4); rgb24_to_yuv420p(lum_tab, cb_tab, cr_tab, rgb_tab, w, h); - f = fopen(filename,"wb"); + f = fopen(filename, "wb"); fprintf(f, "P5\n%d %d\n%d\n", w, (h * 3) / 2, 255); fwrite(lum_tab, 1, w * h, f); h2 = h / 2; w2 = w / 2; cb = cb_tab; cr = cr_tab; - for(i=0;i= height) return; - p = rgb_tab + y * wrap + x * 3; + p = rgb_tab + y * wrap + x * 3; p[0] = r; p[1] = g; p[2] = b; @@ -180,7 +186,7 @@ static int int_cos(int a) neg = 0; if (a > (FRAC_ONE / 4)) { neg = -1; - a = (FRAC_ONE / 2) - a; + a = (FRAC_ONE / 2) - a; } v = FRAC_ONE - ((a * a) >> 4); v = (v ^ neg) - neg; @@ -204,7 +210,7 @@ static void gen_image(int num, int w, int h) unsigned int seed1; if (num == 0) { - for(i=0;i> FRAC_BITS) & 0xff; - g = (((x1 + y1) * 9) >> FRAC_BITS) & 0xff; - b = ((x1 * 5) >> FRAC_BITS) & 0xff; + r = ((y1 * 7) >> FRAC_BITS) & 0xff; + g = (((x1 + y1) * 9) >> FRAC_BITS) & 0xff; + b = ((x1 * 5) >> FRAC_BITS) & 0xff; put_pixel(x, y, r, g, b); } } /* then some noise with very high intensity to test saturation */ seed1 = num; - for(y=0;yh;y++) { - for(x=0;xw;x++) { + for (y = 0; y < p->h; y++) { + for (x = 0; x < p->w; x++) { r = p->r; g = p->g; b = p->b; @@ -277,11 +283,11 @@ int main(int argc, char **argv) h = DEFAULT_HEIGHT; rgb_tab = malloc(w * h * 3); - wrap = w * 3; - width = w; - height = h; + wrap = w * 3; + width = w; + height = h; - for(i=0;i