From f628559d9a600159576faff9735e069479c9d361 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 9 May 2011 11:45:13 +0200 Subject: rotozoom: K&R coding style cosmetics --- tests/rotozoom.c | 207 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 106 insertions(+), 101 deletions(-) (limited to 'tests') diff --git a/tests/rotozoom.c b/tests/rotozoom.c index 505072c4f9..03e9afb86f 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -24,47 +24,52 @@ #include #include -#define FIXP (1<<16) -#define MY_PI 205887 //(M_PI*FIX) +#define FIXP (1 << 16) +#define MY_PI 205887 //(M_PI * FIX) -static int64_t int_pow(int64_t a, int p){ - int64_t v= FIXP; +static int64_t int_pow(int64_t a, int p) +{ + int64_t v = FIXP; - for(; p; p--){ - v*= a; - v/= FIXP; + for (; p; p--) { + v *= a; + v /= FIXP; } return v; } -static int64_t int_sin(int64_t a){ - if(a<0) a= MY_PI-a; // 0..inf - a %= 2*MY_PI; // 0..2PI +static int64_t int_sin(int64_t a) +{ + if (a < 0) + a = MY_PI - a; // 0..inf + a %= 2 * MY_PI; // 0..2PI - if(a>=MY_PI*3/2) a -= 2*MY_PI; // -PI/2 .. 3PI/2 - if(a>=MY_PI/2 ) a = MY_PI - a; // -PI/2 .. PI/2 + if (a >= MY_PI * 3 / 2) + a -= 2 * MY_PI; // -PI / 2 .. 3PI / 2 + if (a >= MY_PI /2) + a = MY_PI - a; // -PI / 2 .. PI / 2 - return a - int_pow(a, 3)/6 + int_pow(a, 5)/120 - int_pow(a, 7)/5040; + return a - int_pow(a, 3) / 6 + int_pow(a, 5) / 120 - int_pow(a, 7) / 5040; } #define SCALEBITS 8 #define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1L<> SCALEBITS; - p += wrap3; + p += wrap3; lum += wrap; r = p[0]; @@ -104,14 +109,14 @@ static void rgb24_to_yuv420p(UINT8 *lum, UINT8 *cb, UINT8 *cr, 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; + FIX(0.08131) * b1 + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128; cb++; cr++; - p += -wrap3 + 2 * 3; - lum += -wrap + 2; + p += -wrap3 + 2 * 3; + lum += -wrap + 2; } - p += wrap3; + p += wrap3; lum += wrap; } } @@ -119,7 +124,7 @@ static void rgb24_to_yuv420p(UINT8 *lum, UINT8 *cb, UINT8 *cr, /* cif format */ #define DEFAULT_WIDTH 352 #define DEFAULT_HEIGHT 288 -#define DEFAULT_NB_PICT 50 +#define DEFAULT_NB_PICT 50 static void pgmyuv_save(const char *filename, int w, int h, unsigned char *rgb_tab) @@ -130,19 +135,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>16; - int int_y= y>>16; - int frac_x= x&0xFFFF; - int frac_y= y&0xFFFF; - int s00= src[ ( int_x &255) + 256*( int_y &255) ]; - int s01= src[ ((int_x+1)&255) + 256*( int_y &255) ]; - int s10= src[ ( int_x &255) + 256*((int_y+1)&255) ]; - int s11= src[ ((int_x+1)&255) + 256*((int_y+1)&255) ]; - int s0= (((1<<16) - frac_x)*s00 + frac_x*s01)>>8; - int s1= (((1<<16) - frac_x)*s10 + frac_x*s11)>>8; - - return (((1<<16) - frac_y)*s0 + frac_y*s1)>>24; +static int ipol(uint8_t *src, int x, int y) +{ + int int_x = x >> 16; + int int_y = y >> 16; + int frac_x = x & 0xFFFF; + int frac_y = y & 0xFFFF; + int s00 = src[( int_x & 255) + 256 * ( int_y & 255)]; + int s01 = src[((int_x + 1) & 255) + 256 * ( int_y & 255)]; + int s10 = src[( int_x & 255) + 256 * ((int_y + 1) & 255)]; + int s11 = src[((int_x + 1) & 255) + 256 * ((int_y + 1) & 255)]; + int s0 = (((1 << 16) - frac_x) * s00 + frac_x * s01) >> 8; + int s1 = (((1 << 16) - frac_x) * s10 + frac_x * s11) >> 8; + + return (((1 << 16) - frac_y) * s0 + frac_y * s1) >> 24; } static void gen_image(int num, int w, int h) { - const int c = h_cos [num % 360]; - const int s = h_sin [num % 360]; - - const int xi = -(w/2) * c; - const int yi = (w/2) * s; + const int c = h_cos [num % 360]; + const int s = h_sin [num % 360]; - const int xj = -(h/2) * s; - const int yj = -(h/2) * c; - int i,j; + const int xi = -(w / 2) * c; + const int yi = (w / 2) * s; - int x,y; - int xprime = xj; - int yprime = yj; + const int xj = -(h / 2) * s; + const int yj = -(h / 2) * c; + int i, j; + int x, y; + int xprime = xj; + int yprime = yj; - for (j=0;j Date: Mon, 9 May 2011 12:23:55 +0200 Subject: rotozoom: Drop some unnecessary parentheses. --- tests/rotozoom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/rotozoom.c b/tests/rotozoom.c index 03e9afb86f..209ed027d1 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -135,13 +135,13 @@ 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"); - fprintf(f, "P5\n%d %d\n%d\n", w, (h * 3) / 2, 255); + 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; @@ -264,8 +264,8 @@ static void init_demo(const char *filename) for (i = 0; i < 360; i++) { radian = 2 * i * MY_PI / 360; h = 2 * FIXP + int_sin (radian); - h_cos[i] = (h * int_sin(radian + MY_PI / 2)) / 2 / FIXP; - h_sin[i] = (h * int_sin(radian) ) / 2 / FIXP; + h_cos[i] = h * int_sin(radian + MY_PI / 2) / 2 / FIXP; + h_sin[i] = h * int_sin(radian) / 2 / FIXP; } } -- cgit v1.2.3 From 5a37c12c82323c0b1f06cf4b8030bcabb554765d Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 9 May 2011 12:26:00 +0200 Subject: rotozoom: Drop silly UINT8 typedef. --- tests/rotozoom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/rotozoom.c b/tests/rotozoom.c index 209ed027d1..642cefa56f 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -56,14 +56,14 @@ static int64_t int_sin(int64_t a) #define SCALEBITS 8 #define ONE_HALF (1 << (SCALEBITS - 1)) #define FIX(x) ((int) ((x) * (1L << SCALEBITS) + 0.5)) -typedef unsigned char UINT8; -static void rgb24_to_yuv420p(UINT8 *lum, UINT8 *cb, UINT8 *cr, - UINT8 *src, int width, int height) +static void rgb24_to_yuv420p(unsigned char *lum, unsigned char *cb, + unsigned char *cr, unsigned char *src, + int width, int height) { int wrap, wrap3, x, y; int r, g, b, r1, g1, b1; - UINT8 *p; + unsigned char *p; wrap = width; wrap3 = width * 3; -- cgit v1.2.3 From 2131e8590c447575a1c23bbc9f7e0bf9592d8997 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 9 May 2011 12:33:45 +0200 Subject: rotozoom: Make init_demo() return int and check for errors on invocation. --- tests/rotozoom.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/rotozoom.c b/tests/rotozoom.c index 642cefa56f..aebcc8e74a 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -234,7 +234,7 @@ static void gen_image(int num, int w, int h) #define W 256 #define H 256 -static void init_demo(const char *filename) +static int init_demo(const char *filename) { int i, j; int h; @@ -246,7 +246,7 @@ static void init_demo(const char *filename) fichier = fopen(filename, "rb"); if (!fichier) { perror(filename); - exit(1); + return 1; } fread(line, 1, 15, fichier); @@ -267,6 +267,8 @@ static void init_demo(const char *filename) h_cos[i] = h * int_sin(radian + MY_PI / 2) / 2 / FIXP; h_sin[i] = h * int_sin(radian) / 2 / FIXP; } + + return 0; } int main(int argc, char **argv) @@ -288,7 +290,8 @@ int main(int argc, char **argv) width = w; height = h; - init_demo(argv[2]); + if (init_demo(argv[2])) + return 1; for (i = 0; i < DEFAULT_NB_PICT; i++) { snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i); -- cgit v1.2.3 From 771339ca206468636a64a6041852068be2da3dd2 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 9 May 2011 11:16:55 +0200 Subject: rotozoom: Return an error value instead of calling exit(). --- tests/rotozoom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/rotozoom.c b/tests/rotozoom.c index aebcc8e74a..644ae8b1eb 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -279,7 +279,7 @@ int main(int argc, char **argv) if (argc != 3) { printf("usage: %s directory/ image.pnm\n" "generate a test video stream\n", argv[0]); - exit(1); + return 1; } w = DEFAULT_WIDTH; -- cgit v1.2.3 From cbb0930f0ebdb2655296d7ae4424ee922168c5b7 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 9 May 2011 12:42:15 +0200 Subject: rotozoom: Check return value of fread(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the warnings: tests/rotozoom.c:252: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result tests/rotozoom.c:254: warning: ignoring return value of ‘fread’, declared with attribute warn_unused_result --- tests/rotozoom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/rotozoom.c b/tests/rotozoom.c index 644ae8b1eb..d61ce21c10 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -249,9 +249,11 @@ static int init_demo(const char *filename) return 1; } - fread(line, 1, 15, fichier); + if (fread(line, 1, 15, fichier) != 15) + return 1; for (i = 0; i < H; i++) { - fread(line, 1, 3 * W, fichier); + if (fread(line, 1, 3 * W, fichier) != 3 * W) + return 1; for (j = 0; j < W; j++) { tab_r[W * i + j] = line[3 * j ]; tab_g[W * i + j] = line[3 * j + 1]; -- cgit v1.2.3 From e1e0ca70eb0cd469b4ba757e3f72e7540ef04056 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 9 May 2011 13:00:04 +0200 Subject: rotozoom: Eliminate French variable name. --- tests/rotozoom.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/rotozoom.c b/tests/rotozoom.c index d61ce21c10..ff817acc3b 100644 --- a/tests/rotozoom.c +++ b/tests/rotozoom.c @@ -241,18 +241,18 @@ static int init_demo(const char *filename) int radian; char line[3 * W]; - FILE *fichier; + FILE *input_file; - fichier = fopen(filename, "rb"); - if (!fichier) { + input_file = fopen(filename, "rb"); + if (!input_file) { perror(filename); return 1; } - if (fread(line, 1, 15, fichier) != 15) + if (fread(line, 1, 15, input_file) != 15) return 1; for (i = 0; i < H; i++) { - if (fread(line, 1, 3 * W, fichier) != 3 * W) + if (fread(line, 1, 3 * W, input_file) != 3 * W) return 1; for (j = 0; j < W; j++) { tab_r[W * i + j] = line[3 * j ]; @@ -260,7 +260,7 @@ static int init_demo(const char *filename) tab_b[W * i + j] = line[3 * j + 2]; } } - fclose(fichier); + fclose(input_file); /* tables sin/cos */ for (i = 0; i < 360; i++) { -- cgit v1.2.3