--- ray/src/util/radcompare.c 2018/10/19 23:50:32 2.13 +++ ray/src/util/radcompare.c 2020/06/30 22:53:05 2.24 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: radcompare.c,v 2.13 2018/10/19 23:50:32 greg Exp $"; +static const char RCSid[] = "$Id: radcompare.c,v 2.24 2020/06/30 22:53:05 greg Exp $"; #endif /* * Compare Radiance files for significant differences @@ -8,12 +8,14 @@ static const char RCSid[] = "$Id: radcompare.c,v 2.13 */ #include -#include #include +#include "rtmath.h" #include "platform.h" #include "rtio.h" #include "resolu.h" #include "color.h" +#include "depthcodec.h" +#include "normcodec.h" #include "lookup.h" /* Reporting levels */ #define REP_QUIET 0 /* no reporting */ @@ -45,17 +47,24 @@ const char *file_type[] = { "ascii", COLRFMT, CIEFMT, + DEPTH16FMT, + NORMAL32FMT, "float", "double", "BSDF_RBFmesh", "Radiance_octree", "Radiance_tmesh", + "8-bit_indexed_name", + "16-bit_indexed_name", + "24-bit_indexed_name", "BINARY_unknown", NULL /* terminator */ }; /* keep consistent with above */ -enum {TYP_UNKNOWN, TYP_TEXT, TYP_ASCII, TYP_RGBE, TYP_XYZE, TYP_FLOAT, - TYP_DOUBLE, TYP_RBFMESH, TYP_OCTREE, TYP_TMESH, TYP_BINARY}; +enum {TYP_UNKNOWN, TYP_TEXT, TYP_ASCII, TYP_RGBE, TYP_XYZE, + TYP_DEPTH, TYP_NORM, TYP_FLOAT, TYP_DOUBLE, + TYP_RBFMESH, TYP_OCTREE, TYP_TMESH, + TYP_ID8, TYP_ID16, TYP_ID24, TYP_BINARY}; #define has_header(t) (!( 1L<<(t) & (1L<ptr = NULL, (bp)->siz = 0) +#define init_line(bp) ((bp)->str = NULL, (bp)->siz = 0) /* 100 MByte limit on line buffer */ #define MAXBUF (100L<<20) @@ -89,6 +99,7 @@ char *progname = NULL; const char stdin_name[] = ""; const char *f1name=NULL, *f2name=NULL; FILE *f1in=NULL, *f2in=NULL; +int f1swap=0, f2swap=0; /* running real differences */ double diff2sum = 0; @@ -109,24 +120,33 @@ usage() static int read_line(LINEBUF *bp, FILE *fp) { + static int doneWarn = 0; + bp->len = 0; - if (!bp->ptr) { - bp->ptr = (char *)malloc(bp->siz = 512); - if (!bp->ptr) + if (!bp->str) { + bp->str = (char *)malloc(bp->siz = 512); + if (!bp->str) goto memerr; } - while (fgets(bp->ptr + bp->len, bp->siz - bp->len, fp)) { - bp->len += strlen(bp->ptr + bp->len); - if (bp->ptr[bp->len-1] == '\n') + while (fgets(bp->str + bp->len, bp->siz - bp->len, fp)) { + bp->len += strlen(bp->str + bp->len); + if (bp->str[bp->len-1] == '\n') break; /* found EOL */ if (bp->len < bp->siz - 4) continue; /* at EOF? */ - if (bp->siz >= MAXBUF) - break; /* don't go to extremes */ + if (bp->siz >= MAXBUF) { + if ((report >= REP_WARN) & !doneWarn) { + fprintf(stderr, + "%s: warning - input line(s) past %ld MByte limit\n", + progname, MAXBUF>>20); + doneWarn++; + } + break; /* return MAXBUF partial line */ + } if ((bp->siz += bp->siz/2) > MAXBUF) bp->siz = MAXBUF; - bp->ptr = (char *)realloc(bp->ptr, bp->siz); - if (!bp->ptr) + bp->str = (char *)realloc(bp->str, bp->siz); + if (!bp->str) goto memerr; } return(bp->len); @@ -141,7 +161,7 @@ memerr: static void free_line(LINEBUF *bp) { - if (bp->ptr) free(bp->ptr); + if (bp->str) free(bp->str); init_line(bp); } @@ -190,8 +210,8 @@ color_check(COLOR c1, COLOR c2) { int p; - if (!real_check(colval(c1,RED)+colval(c1,GRN)+colval(c1,BLU)*(1./3.), - colval(c2,RED)+colval(c2,GRN)+colval(c2,BLU))*(1./3.)) + if (!real_check((colval(c1,RED)+colval(c1,GRN)+colval(c1,BLU))*(1./3.), + (colval(c2,RED)+colval(c2,GRN)+colval(c2,BLU))*(1./3.))) return(0); p = (colval(c1,GRN) > colval(c1,RED)) ? GRN : RED; @@ -200,6 +220,31 @@ color_check(COLOR c1, COLOR c2) return(real_check(colval(c1,p), colval(c2,p))); } +/* Compare two normal directions for equivalence */ +static int +norm_check(FVECT nv1, FVECT nv2) +{ + double max2 = nv1[2]*nv2[2]; + int imax = 2; + int i = 2; + /* identify largest component */ + while (i--) { + double tm2 = nv1[i]*nv2[i]; + if (tm2 > max2) { + imax = i; + max2 = tm2; + } + } + i = 3; /* compare smaller components */ + while (i--) { + if (i == imax) + continue; + if (!real_check(nv1[i], nv2[i])) + return(0); + } + return(1); +} + /* Compare two strings for equivalence */ static int equiv_string(char *s1, char *s2) @@ -272,6 +317,7 @@ equiv_string(char *s1, char *s2) static int setheadvar(char *val, void *p) { + char newval[128]; LUTAB *htp = (LUTAB *)p; LUENT *tep; char *key; @@ -281,6 +327,14 @@ setheadvar(char *val, void *p) adv_linecnt(htp); /* side-effect is to count lines */ if (!isalpha(*val)) /* key must start line */ return(0); + /* check if we need to swap binary data */ + if ((n = isbigendian(val)) >= 0) { + if (nativebigendian() == n) + return(0); + f1swap += (htp == &hdr1); + f2swap += (htp == &hdr2); + return(0); + } key = val++; while (*val && !isspace(*val) & (*val != '=')) val++; @@ -306,8 +360,13 @@ setheadvar(char *val, void *p) return(-1); /* memory allocation error */ if (!tep->key) tep->key = strcpy(malloc(kln+1), key); - if (tep->data) + if (tep->data) { /* check for special cases */ + if (!strcmp(key, "EXPOSURE")) { + sprintf(newval, "%f", atof(tep->data)*atof(val)); + vln = strlen(val = newval); + } free(tep->data); + } tep->data = strcpy(malloc(vln+1), val); return(1); } @@ -504,12 +563,12 @@ compare_text() init_line(&l1buf); init_line(&l2buf); /* compare a line at a time */ while (read_line(&l1buf, f1in)) { lin1cnt++; - if (!*sskip2(l1buf.ptr,0)) + if (!*sskip2(l1buf.str,0)) continue; /* ignore empty lines */ while (read_line(&l2buf, f2in)) { lin2cnt++; - if (*sskip2(l2buf.ptr,0)) + if (*sskip2(l2buf.str,0)) break; /* found other non-empty line */ } if (!l2buf.len) { /* input 2 EOF? */ @@ -521,7 +580,7 @@ compare_text() return(0); } /* compare non-empty lines */ - if (!equiv_string(l1buf.ptr, l2buf.ptr)) { + if (!equiv_string(l1buf.str, l2buf.str)) { if (report != REP_QUIET) { printf("%s: inputs '%s' and '%s' differ at line %d|%d\n", progname, f1name, f2name, @@ -531,9 +590,9 @@ compare_text() (l2buf.len < 256) ) { fputs("------------- Mismatch -------------\n", stdout); printf("%s@%d:\t%s", f1name, - lin1cnt, l1buf.ptr); + lin1cnt, l1buf.str); printf("%s@%d:\t%s", f2name, - lin2cnt, l2buf.ptr); + lin2cnt, l2buf.str); } } free_line(&l1buf); free_line(&l2buf); @@ -542,7 +601,7 @@ compare_text() } free_line(&l1buf); /* check for EOF on input 2 */ while (read_line(&l2buf, f2in)) { - if (!*sskip2(l2buf.ptr,0)) + if (!*sskip2(l2buf.str,0)) continue; if (report != REP_QUIET) { fputs(f1name, stdout); @@ -555,6 +614,27 @@ compare_text() return(good_RMS()); /* final check for reals */ } +/* Check image/map resolutions */ +static int +check_resolu(const char *class, RESOLU *r1p, RESOLU *r2p) +{ + if (r1p->rt != r2p->rt) { + if (report != REP_QUIET) + printf( + "%s: %ss '%s' and '%s' have different pixel ordering\n", + progname, class, f1name, f2name); + return(0); + } + if ((r1p->xr != r2p->xr) | (r1p->yr != r2p->yr)) { + if (report != REP_QUIET) + printf( + "%s: %ss '%s' and '%s' are different sizes\n", + progname, class, f1name, f2name); + return(0); + } + return(1); +} + /* Compare two inputs that are known to be RGBE or XYZE images */ static int compare_hdr() @@ -569,20 +649,8 @@ compare_hdr() } fgetsresolu(&rs1, f1in); fgetsresolu(&rs2, f2in); - if (rs1.rt != rs2.rt) { - if (report != REP_QUIET) - printf( - "%s: Images '%s' and '%s' have different pixel ordering\n", - progname, f1name, f2name); + if (!check_resolu("HDR image", &rs1, &rs2)) return(0); - } - if ((rs1.xr != rs2.xr) | (rs1.yr != rs2.yr)) { - if (report != REP_QUIET) - printf( - "%s: Images '%s' and '%s' are different sizes\n", - progname, f1name, f2name); - return(0); - } scan1 = (COLOR *)malloc(scanlen(&rs1)*sizeof(COLOR)); scan2 = (COLOR *)malloc(scanlen(&rs2)*sizeof(COLOR)); if (!scan1 | !scan2) { @@ -627,6 +695,133 @@ compare_hdr() return(good_RMS()); /* final check of RMS */ } +/* Set reference depth based on header variable */ +static int +set_refdepth(DEPTHCODEC *dcp, LUTAB *htp) +{ + static char depthvar[] = DEPTHSTR; + const char *drval; + + depthvar[LDEPTHSTR-1] = '\0'; + drval = (const char *)lu_find(htp, depthvar)->data; + if (!drval) + return(0); + dcp->refdepth = atof(drval); + if (dcp->refdepth <= 0) { + if (report != REP_QUIET) { + fputs(dcp->inpname, stderr); + fputs(": bad reference depth '", stderr); + fputs(drval, stderr); + fputs("'\n", stderr); + } + return(-1); + } + return(1); +} + +/* Compare two encoded depth maps */ +static int +compare_depth() +{ + long nread = 0; + DEPTHCODEC dc1, dc2; + + if (report >= REP_VERBOSE) { + fputs(progname, stdout); + fputs(": comparing inputs as depth maps\n", stdout); + } + set_dc_defaults(&dc1); + dc1.hdrflags = HF_RESIN; + dc1.finp = f1in; + dc1.inpname = f1name; + set_dc_defaults(&dc2); + dc2.hdrflags = HF_RESIN; + dc2.finp = f2in; + dc2.inpname = f2name; + if (report != REP_QUIET) { + dc1.hdrflags |= HF_STDERR; + dc2.hdrflags |= HF_STDERR; + } + if (!process_dc_header(&dc1, 0, NULL)) + return(0); + if (!process_dc_header(&dc2, 0, NULL)) + return(0); + if (!check_resolu("Depth map", &dc1.res, &dc2.res)) + return(0); + if (set_refdepth(&dc1, &hdr1) < 0) + return(0); + if (set_refdepth(&dc2, &hdr2) < 0) + return(0); + while (nread < dc1.res.xr*dc1.res.yr) { + double d1 = decode_depth_next(&dc1); + double d2 = decode_depth_next(&dc2); + if ((d1 < 0) | (d2 < 0)) { + if (report != REP_QUIET) + printf("%s: unexpected end-of-file\n", + progname); + return(0); + } + ++nread; + if (real_check(d1, d2)) + continue; + if (report != REP_QUIET) + printf("%s: %ld%s depth values differ\n", + progname, nread, num_sfx(nread)); + return(0); + } + return(good_RMS()); /* final check of RMS */ +} + +/* Compare two encoded normal maps */ +static int +compare_norm() +{ + long nread = 0; + NORMCODEC nc1, nc2; + + if (report >= REP_VERBOSE) { + fputs(progname, stdout); + fputs(": comparing inputs as normal maps\n", stdout); + } + set_nc_defaults(&nc1); + nc1.hdrflags = HF_RESIN; + nc1.finp = f1in; + nc1.inpname = f1name; + set_nc_defaults(&nc2); + nc2.hdrflags = HF_RESIN; + nc2.finp = f2in; + nc2.inpname = f2name; + if (report != REP_QUIET) { + nc1.hdrflags |= HF_STDERR; + nc2.hdrflags |= HF_STDERR; + } + if (!process_nc_header(&nc1, 0, NULL)) + return(0); + if (!process_nc_header(&nc2, 0, NULL)) + return(0); + if (!check_resolu("Normal map", &nc1.res, &nc2.res)) + return(0); + while (nread < nc1.res.xr*nc1.res.yr) { + FVECT nv1, nv2; + int rv1 = decode_normal_next(nv1, &nc1); + int rv2 = decode_normal_next(nv2, &nc2); + if ((rv1 < 0) | (rv2 < 0)) { + if (report != REP_QUIET) + printf("%s: unexpected end-of-file\n", + progname); + return(0); + } + ++nread; + if (rv1 == rv2 && (!rv1 || norm_check(nv1, nv2))) + continue; + if (report != REP_QUIET) + printf("%s: %ld%s normal vectors differ\n", + progname, nread, num_sfx(nread)); + return(0); + } + return(good_RMS()); /* final check of RMS */ +} + /* Compare two inputs that are known to be 32-bit floating-point data */ static int compare_float() @@ -642,6 +837,8 @@ compare_float() if (!getbinary(&f2, sizeof(f2), 1, f2in)) goto badeof; ++nread; + if (f1swap) swap32((char *)&f1, 1); + if (f2swap) swap32((char *)&f2, 1); if (real_check(f1, f2)) continue; if (report != REP_QUIET) @@ -672,6 +869,8 @@ compare_double() if (!getbinary(&f2, sizeof(f2), 1, f2in)) goto badeof; ++nread; + if (f1swap) swap64((char *)&f1, 1); + if (f2swap) swap64((char *)&f2, 1); if (real_check(f1, f2)) continue; if (report != REP_QUIET) @@ -760,7 +959,7 @@ main(int argc, char *argv[]) return(2); if (typ1 != typ2) { if (report != REP_QUIET) - printf("%s: '%s' is %s and '%s' is %s\n", + printf("%s: '%s' format is %s and '%s' is %s\n", progname, f1name, file_type[typ1], f2name, file_type[typ2]); return(1); @@ -768,24 +967,33 @@ main(int argc, char *argv[]) ign_header |= !has_header(typ1); /* check headers if indicated */ if (!ign_header && !headers_match()) return(1); - lu_done(&hdr1); lu_done(&hdr2); if (!ign_header & (report >= REP_WARN)) { - if (typ1 == TYP_UNKNOWN) - printf("%s: warning - unrecognized format, comparing as binary\n", - progname); if (lin1cnt != lin2cnt) printf("%s: warning - headers are different lengths\n", progname); + if (typ1 == TYP_UNKNOWN) + printf("%s: warning - unrecognized format\n", + progname); } - if (report >= REP_VERBOSE) - printf("%s: input file type is %s\n", - progname, file_type[typ1]); - + if (report >= REP_VERBOSE) { + printf("%s: data format is %s\n", progname, file_type[typ1]); + if ((typ1 == TYP_FLOAT) | (typ1 == TYP_DOUBLE)) { + if (f1swap) + printf("%s: input '%s' is byte-swapped\n", + progname, f1name); + if (f2swap) + printf("%s: input '%s' is byte-swapped\n", + progname, f2name); + } + } switch (typ1) { /* compare based on type */ case TYP_BINARY: case TYP_TMESH: case TYP_OCTREE: case TYP_RBFMESH: + case TYP_ID8: + case TYP_ID16: + case TYP_ID24: case TYP_UNKNOWN: return( !compare_binary() ); case TYP_TEXT: @@ -794,6 +1002,10 @@ main(int argc, char *argv[]) case TYP_RGBE: case TYP_XYZE: return( !compare_hdr() ); + case TYP_DEPTH: + return( !compare_depth() ); + case TYP_NORM: + return( !compare_norm() ); case TYP_FLOAT: return( !compare_float() ); case TYP_DOUBLE: