21 |
|
|
22 |
|
int cerrzero; /* is cerrmap all zeroes? */ |
23 |
|
|
24 |
+ |
static int ppri_cmp(const void *pp1, const void *pp2); |
25 |
+ |
static int ray_refine(int n); |
26 |
+ |
static long refine_rays(long nrays); |
27 |
|
|
28 |
< |
int |
29 |
< |
refine_first() /* initial refinement pass */ |
28 |
> |
|
29 |
> |
extern int |
30 |
> |
refine_first(void) /* initial refinement pass */ |
31 |
|
{ |
32 |
|
int *esamp = (int *)zprev; /* OK to reuse */ |
33 |
|
int hl_erri = errori(HL_ERR); |
55 |
|
if (xmbuffer[n] == MO_UNK) |
56 |
|
continue; |
57 |
|
xp = x + xmbuffer[n]; |
58 |
< |
if ((xp < 0 | xp >= hres)) |
58 |
> |
if ((xp < 0) | (xp >= hres)) |
59 |
|
continue; |
60 |
|
yp = y + ymbuffer[n]; |
61 |
< |
if ((yp < 0 | yp >= vres)) |
61 |
> |
if ((yp < 0) | (yp >= vres)) |
62 |
|
continue; |
63 |
|
np = fndx(xp, yp); |
64 |
|
/* make sure we hit same object */ |
121 |
|
static double pixel_deg; /* base pixel frequency */ |
122 |
|
static int fhsiz, fvsiz; /* foveal subimage size */ |
123 |
|
|
124 |
+ |
static void clr_consp(struct ConspSum *cs); |
125 |
+ |
static void sum_consp(struct ConspSum *cdest, struct ConspSum *cs); |
126 |
+ |
static void est_consp(int x0, int y0, int x1, int y1, struct ConspSum *cs); |
127 |
+ |
static void subconspicuity(int x0, int y0, int x1, int y1, struct ConspSum *cs); |
128 |
+ |
|
129 |
|
static void |
130 |
< |
clr_consp(cs) /* initialize a conspicuity sum */ |
131 |
< |
register struct ConspSum *cs; |
130 |
> |
clr_consp( /* initialize a conspicuity sum */ |
131 |
> |
register struct ConspSum *cs |
132 |
> |
) |
133 |
|
{ |
134 |
|
if (cs == NULL) |
135 |
|
return; |
142 |
|
} |
143 |
|
|
144 |
|
static void |
145 |
< |
sum_consp(cdest, cs) /* sum in conspicuity result */ |
146 |
< |
register struct ConspSum *cdest, *cs; |
145 |
> |
sum_consp( /* sum in conspicuity result */ |
146 |
> |
register struct ConspSum *cdest, |
147 |
> |
register struct ConspSum *cs |
148 |
> |
) |
149 |
|
{ |
150 |
< |
if ((cdest == NULL | cs == NULL)) |
150 |
> |
if ((cdest == NULL) | (cs == NULL)) |
151 |
|
return; |
152 |
|
addcolor(cdest->vsum, cs->vsum); |
153 |
|
addcolor(cdest->v2sum, cs->v2sum); |
160 |
|
} |
161 |
|
|
162 |
|
static void |
163 |
< |
est_consp(x0,y0,x1,y1, cs) /* estimate error conspicuity & update */ |
164 |
< |
int x0, y0, x1, y1; |
165 |
< |
register struct ConspSum *cs; |
163 |
> |
est_consp( /* estimate error conspicuity & update */ |
164 |
> |
int x0, |
165 |
> |
int y0, |
166 |
> |
int x1, |
167 |
> |
int y1, |
168 |
> |
register struct ConspSum *cs |
169 |
> |
) |
170 |
|
{ |
171 |
|
double rad2, mtn2, cpd, vm, vr, csf, eest; |
172 |
|
/* do we care? */ |
181 |
|
} else |
182 |
|
eest = estimaterr(cs->vsum, cs->v2sum, cs->nsamp, cs->nsamp); |
183 |
|
|
184 |
< |
if ((x0 == x1-1 & y0 == y1-1)) { /* update pixel error */ |
184 |
> |
if ((x0 == x1-1) & (y0 == y1-1)) { /* update pixel error */ |
185 |
|
int n = fndx(x0, y0); |
186 |
|
int ai; |
187 |
|
int ne; |
233 |
|
/* worth the bother? */ |
234 |
|
if (eest <= .01) |
235 |
|
return; |
236 |
< |
/* sum into map */ |
236 |
> |
/* put into map */ |
237 |
|
for ( ; y0 < y1; y0++) { |
238 |
|
float *em0 = cerrmap + fndx(x0, y0); |
239 |
|
register float *emp = em0 + (x1-x0); |
240 |
|
while (emp-- > em0) |
241 |
< |
*emp += eest; |
241 |
> |
if (eest > *emp) |
242 |
> |
*emp = eest; |
243 |
|
} |
244 |
|
cerrzero = 0; |
245 |
|
} |
246 |
|
|
247 |
|
static void |
248 |
< |
subconspicuity(x0,y0,x1,y1, cs) /* compute subportion of conspicuity */ |
249 |
< |
int x0, y0, x1, y1; |
250 |
< |
struct ConspSum *cs; |
248 |
> |
subconspicuity( /* compute subportion of conspicuity */ |
249 |
> |
int x0, |
250 |
> |
int y0, |
251 |
> |
int x1, |
252 |
> |
int y1, |
253 |
> |
struct ConspSum *cs |
254 |
> |
) |
255 |
|
{ |
256 |
|
struct ConspSum mysum; |
257 |
|
int i; |
258 |
|
|
259 |
< |
if ((x0 >= x1 | y0 >= y1)) |
259 |
> |
if ((x0 >= x1) | (y0 >= y1)) |
260 |
|
error(CONSISTENCY, "bad call to subconspicuity"); |
261 |
|
|
262 |
|
clr_consp(&mysum); /* prepare sum */ |
263 |
|
|
264 |
< |
if ((x0 == x1-1 & y0 == y1-1)) { /* single pixel */ |
264 |
> |
if ((x0 == x1-1) & (y0 == y1-1)) { /* single pixel */ |
265 |
|
double hls; |
266 |
|
register int n = fndx(x0, y0); |
267 |
|
if (sbuffer[n]) { |
310 |
|
sum_consp(cs, &mysum); |
311 |
|
} |
312 |
|
|
313 |
< |
void |
314 |
< |
conspicuity() /* compute conspicuous error map */ |
313 |
> |
extern void |
314 |
> |
conspicuity(void) /* compute conspicuous error map */ |
315 |
|
{ |
316 |
|
int fhres, fvres; |
317 |
|
int fx, fy; |
351 |
|
|
352 |
|
|
353 |
|
static int |
354 |
< |
ppri_cmp(pp1, pp2) /* pixel priority comparison */ |
355 |
< |
const void *pp1, *pp2; |
354 |
> |
ppri_cmp( /* pixel priority comparison */ |
355 |
> |
const void *pp1, |
356 |
> |
const void *pp2 |
357 |
> |
) |
358 |
|
{ |
359 |
|
double se1 = cerrmap[*(const int *)pp1]; |
360 |
|
double se2 = cerrmap[*(const int *)pp2]; |
374 |
|
|
375 |
|
|
376 |
|
static int |
377 |
< |
ray_refine(n) /* refine the given pixel by tracing a ray */ |
378 |
< |
register int n; |
377 |
> |
ray_refine( /* refine the given pixel by tracing a ray */ |
378 |
> |
register int n |
379 |
> |
) |
380 |
|
{ |
381 |
|
RAY ir; |
358 |
– |
int neigh[NSAMPOK]; |
359 |
– |
int nc; |
382 |
|
COLOR ctmp; |
383 |
|
int i; |
384 |
|
|
411 |
|
if (sbuffer[n] != 1) |
412 |
|
error(CONSISTENCY, "bad code in ray_refine"); |
413 |
|
if (getambcolor(ctmp, obuffer[n]) && |
414 |
< |
(colval(ctmp,RED) > 0.01 & |
415 |
< |
colval(ctmp,GRN) > 0.01 & |
416 |
< |
colval(ctmp,BLU) > 0.01)) { |
414 |
> |
(colval(ctmp,RED) > 0.01) & |
415 |
> |
(colval(ctmp,GRN) > 0.01) & |
416 |
> |
(colval(ctmp,BLU) > 0.01)) { |
417 |
|
for (i = 0; i < 3; i++) |
418 |
|
asump->diffsum[i] += |
419 |
|
(colval(ir.rcol,i) - colval(cbuffer[n],i)) |
441 |
|
|
442 |
|
|
443 |
|
static long |
444 |
< |
refine_rays(nrays) /* compute refinement rays */ |
445 |
< |
long nrays; |
444 |
> |
refine_rays( /* compute refinement rays */ |
445 |
> |
long nrays |
446 |
> |
) |
447 |
|
{ |
448 |
|
int *pord; |
449 |
|
int ntodo; |
451 |
|
int i; |
452 |
|
/* skip if nothing significant */ |
453 |
|
if (ndtset && cerrzero) |
454 |
< |
return; |
454 |
> |
return(0); |
455 |
|
/* initialize priority list */ |
456 |
|
pord = (int *)malloc(sizeof(int)*hres*vres); |
457 |
|
for (i = hres*vres; i--; ) |
486 |
|
} |
487 |
|
|
488 |
|
|
489 |
< |
int |
490 |
< |
refine_frame(pass) /* refine current frame */ |
491 |
< |
int pass; |
489 |
> |
extern int |
490 |
> |
refine_frame( /* refine current frame */ |
491 |
> |
int pass |
492 |
> |
) |
493 |
|
{ |
494 |
|
static double rtime_used = 0; |
495 |
|
static long ray_cnt = 0; |
496 |
|
static double ctime_used = 0; |
497 |
|
static int csp_cnt = 0; |
498 |
< |
int timed = (fcur > fbeg | pass > 0 | quickstart); |
498 |
> |
int timed = (fcur > fbeg) | (pass > 0) | (quickstart); |
499 |
|
double time_start, rtime_start, time_done; |
500 |
|
struct AmbSum myAmbSum; |
501 |
|
long rays_todo, nr; |
502 |
|
register int n; |
503 |
|
/* IBR refinement? */ |
504 |
< |
if ((pass == 0 & fcur > fbeg)) |
504 |
> |
if ((pass == 0) & (fcur > fbeg)) |
505 |
|
return(refine_first()); |
506 |
|
/* any time left? */ |
507 |
|
time_start = getTime(); |
578 |
|
/* compute refinement rays */ |
579 |
|
if (!silent) { |
580 |
|
printf("\tRefinement pass %d...", |
581 |
< |
pass+1, rays_todo); |
581 |
> |
pass+1); /*, rays_todo); */ |
582 |
|
fflush(stdout); |
583 |
|
} |
584 |
|
if (asump != NULL) /* flag low-quality samples */ |
588 |
|
/* trace those rays */ |
589 |
|
nr = refine_rays(rays_todo); |
590 |
|
if (!silent) |
591 |
< |
printf("traced %d HQ rays\n", nr); |
591 |
> |
printf("traced %ld HQ rays\n", nr); |
592 |
|
if (nr <= 0) |
593 |
|
return(0); |
594 |
|
/* update timing stats */ |
623 |
|
return(1); |
624 |
|
nomore: |
625 |
|
/* make sure error map is updated */ |
626 |
< |
if ((fcur == fbeg | pass > 1)) |
626 |
> |
if ((fcur == fbeg) | (pass > 1)) |
627 |
|
comp_frame_error(); |
628 |
|
return(0); |
629 |
|
} |