--- ray/src/common/tonemap.c 2011/04/22 14:35:54 3.36 +++ ray/src/common/tonemap.c 2021/05/04 21:50:54 3.51 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: tonemap.c,v 3.36 2011/04/22 14:35:54 greg Exp $"; +static const char RCSid[] = "$Id: tonemap.c,v 3.51 2021/05/04 21:50:54 greg Exp $"; #endif /* * Tone mapping functions. @@ -14,6 +14,7 @@ static const char RCSid[] = "$Id: tonemap.c,v 3.36 201 #include #include #include +#include #include "tmprivat.h" #include "tmerrmsg.h" @@ -66,7 +67,7 @@ double gamval tmnew->mongam = gamval; /* set color divisors */ for (i = 0; i < 3; i++) - tmnew->cdiv[i] = 256.*pow(tmnew->clf[i], 1./tmnew->mongam); + tmnew->cdiv[i] = TM_BRES*pow(tmnew->clf[i], 1./tmnew->mongam); /* set input transform */ tmnew->inppri = tmnew->monpri; @@ -122,15 +123,14 @@ MEM_PTR dat tms->clf[GRN] = tms->cmat[1][1]; tms->clf[BLU] = tms->cmat[1][2]; } - tms->cmat[0][0] = tms->cmat[1][1] = tms->cmat[2][2] = - tms->inpsf; + tms->cmat[0][0] = tms->cmat[1][1] = tms->cmat[2][2] = 1.; tms->cmat[0][1] = tms->cmat[0][2] = tms->cmat[1][0] = tms->cmat[1][2] = tms->cmat[2][0] = tms->cmat[2][1] = 0.; - } else if (tms->inppri == TM_XYZPRIM) /* input is XYZ */ + } else if (tms->inppri == TM_XYZPRIM) { /* input is XYZ */ compxyz2rgbWBmat(tms->cmat, tms->monpri); - else { /* input is RGB */ + } else { /* input is RGB */ if (tms->inppri != tms->monpri && PRIMEQ(tms->inppri, tms->monpri)) tms->inppri = tms->monpri; /* no xform */ @@ -142,7 +142,7 @@ MEM_PTR dat tms->cmat[i][j] *= tms->inpsf; /* set color divisors */ for (i = 0; i < 3; i++) - tms->cdiv[i] = 256.*pow(tms->clf[i] < .001 ? .001 : + tms->cdiv[i] = TM_BRES*pow(tms->clf[i] < .001 ? .001 : tms->clf[i], 1./tms->mongam); /* notify packages */ for (i = tmNumPkgs; i--; ) @@ -159,7 +159,8 @@ TMstruct *tms { if (tms == NULL || tms->histo == NULL) return; - free((MEM_PTR)tms->histo); + free(tms->histo); + tms->hbrmin = 10; tms->hbrmax = -10; tms->histo = NULL; } @@ -252,13 +253,13 @@ int tmCvColors( /* convert float colors */ TMstruct *tms, TMbright *ls, -BYTE *cs, +uby8 *cs, COLOR *scan, int len ) { static const char funcName[] = "tmCvColors"; - static BYTE gamtab[1024]; + static uby8 gamtab[1024]; static double curgam = .0; COLOR cmon; float lum, slum, d; @@ -343,7 +344,7 @@ int wt { static const char funcName[] = "tmAddHisto"; int oldorig=0, oldlen, horig, hlen; - int i, j; + int i; if (tms == NULL) returnErr(TM_E_TMINVAL); @@ -364,23 +365,23 @@ int wt oldlen = HISTI(tms->hbrmax) + 1 - oldorig; } for (i = len; i--; ) { - if ((j = ls[i]) < MINBRT) + if (ls[i] < MINBRT) continue; - if (j < tms->hbrmin) - tms->hbrmin = j; - else if (j > tms->hbrmax) - tms->hbrmax = j; + if (ls[i] < tms->hbrmin) + tms->hbrmin = ls[i]; + else if (ls[i] > tms->hbrmax) + tms->hbrmax = ls[i]; } horig = HISTI(tms->hbrmin); hlen = HISTI(tms->hbrmax) + 1 - horig; if (hlen > oldlen) { /* (re)allocate histogram */ - int *newhist = (int *)calloc(hlen, sizeof(int)); + HIST_TYP *newhist = (HIST_TYP *)calloc(hlen, sizeof(HIST_TYP)); if (newhist == NULL) returnErr(TM_E_NOMEM); if (oldlen) { /* copy and free old */ - for (i = oldlen, j = i+oldorig-horig; i; ) - newhist[--j] = tms->histo[--i]; - free((MEM_PTR)tms->histo); + memcpy(newhist+(oldorig-horig), + tms->histo, oldlen*sizeof(HIST_TYP)); + free(tms->histo); } tms->histo = newhist; } @@ -420,25 +421,32 @@ int tmFixedMapping( /* compute fixed, linear tone-mapping */ TMstruct *tms, double expmult, -double gamval +double gamval, +double Lddyn ) { static const char funcName[] = "tmFixedMapping"; - double d; - int i; + const int maxV = (1L<<(8*sizeof(TMAP_TYP))) - 1; + double minD; + int i; if (!tmNewMap(tms)) returnErr(TM_E_NOMEM); - if (expmult <= .0) - expmult = 1.; - if (gamval < MINGAM) - gamval = tms->mongam; - d = log(expmult/tms->inpsf); + /* check arguments */ + if (expmult <= .0) expmult = 1.; + if (gamval < MINGAM) gamval = tms->mongam; + if (Lddyn < MINLDDYN) Lddyn = DEFLDDYN; + minD = 1./Lddyn; for (i = tms->mbrmax-tms->mbrmin+1; i--; ) { - double val = 256. * exp( - ( d + (tms->mbrmin+i)*(1./TM_BRTSCALE) ) - / gamval); - tms->lumap[i] = val >= (double)0xffff ? 0xffff : (int)val; + double d; + d = expmult/tms->inpsf * tmLuminance(tms->mbrmin + i); + if (d >= 2.*minD) + d -= minD; + else /* soft black crushing */ + d *= d/(4.*minD); + d /= 1. - minD; + d = TM_BRES*pow(d, 1./gamval); + tms->lumap[i] = (d > maxV) ? maxV : (int)d; } returnOK; } @@ -453,11 +461,11 @@ double Ldmax ) { static const char funcName[] = "tmComputeMapping"; - int *histo; + HIST_TYP *histo; float *cumf; - int brt0, histlen, threshold, ceiling, trimmings; - double logLddyn, Ldmin, Ldavg, Lwavg, Tr, Lw, Ld; - int32 histot; + int brt0, histlen; + HIST_TYP threshold, ceiling, trimmings, histot; + double logLddyn, Ldmin, Lwavg, Tr, Lw, Ld; double sum; double d; int i, j; @@ -471,7 +479,6 @@ double Ldmax /* compute handy values */ Ldmin = Ldmax/Lddyn; logLddyn = log(Lddyn); - Ldavg = sqrt(Ldmax*Ldmin); i = HISTI(tms->hbrmin); brt0 = HISTV(i); histlen = HISTI(tms->hbrmax) + 1 - i; @@ -482,31 +489,31 @@ double Ldmax histot += tms->histo[i]; sum += (double)(j -= HISTEP) * tms->histo[i]; } - threshold = histot*0.005 + .5; if (!histot) returnErr(TM_E_TMFAIL); + threshold = histot/40 + 1; Lwavg = tmLuminance( (double)sum / histot ); /* use linear tone mapping? */ if (tms->flags & TM_F_LINEAR || threshold < 4 || tms->hbrmax - tms->hbrmin < TM_BRTSCALE*logLddyn) goto linearmap; /* clamp histogram */ - histo = (int *)malloc(histlen*sizeof(int)); + histo = (HIST_TYP *)malloc(histlen*sizeof(HIST_TYP)); cumf = (float *)malloc((histlen+2)*sizeof(float)); if ((histo == NULL) | (cumf == NULL)) returnErr(TM_E_NOMEM); cumf[histlen+1] = 1.; /* guard for assignment code */ - for (i = histlen; i--; ) /* make malleable copy */ - histo[i] = tms->histo[i]; + /* make malleable copy */ + memcpy(histo, tms->histo, histlen*sizeof(HIST_TYP)); do { /* iterate to solution */ sum = 0; /* cumulative probability */ for (i = 0; i < histlen; i++) { - cumf[i] = (double)sum/histot; - sum += histo[i]; + cumf[i] = sum/histot; + sum += (double)histo[i]; } cumf[histlen] = 1.; Tr = histot * (double)(tms->hbrmax - tms->hbrmin) / - ((double)histlen*TM_BRTSCALE) / logLddyn; + ((double)TM_BRTSCALE*histlen*logLddyn); ceiling = Tr + 1.; trimmings = 0; /* clip to envelope */ for (i = histlen; i--; ) { @@ -524,11 +531,11 @@ double Ldmax } /* check if we're out of data */ if ((histot -= trimmings) <= threshold) { - free((MEM_PTR)histo); - free((MEM_PTR)cumf); + free(histo); + free(cumf); goto linearmap; } - } while (trimmings > threshold); + } while (40*trimmings > histot); /* allocate space for mapping */ if (!tmNewMap(tms)) returnErr(TM_E_NOMEM); @@ -538,47 +545,53 @@ double Ldmax d -= (double)j; Ld = Ldmin*exp(logLddyn*((1.-d)*cumf[j]+d*cumf[j+1])); d = (Ld - Ldmin)/(Ldmax - Ldmin); - tms->lumap[i] = 256.*pow(d, 1./gamval); + tms->lumap[i] = TM_BRES*pow(d, 1./gamval); } - free((MEM_PTR)histo); /* clean up and return */ - free((MEM_PTR)cumf); + free(histo); /* clean up and return */ + free(cumf); returnOK; linearmap: /* linear tone-mapping */ if (tms->flags & TM_F_HCONTR) - d = htcontrs(Ldavg) / htcontrs(Lwavg); + d = htcontrs(sqrt(Ldmax*Ldmin)) / htcontrs(Lwavg); else - d = Ldavg / Lwavg; - return(tmFixedMapping(tms, tms->inpsf*d/Ldmax, gamval)); + d = Ldmax / tmLuminance(tms->hbrmax); + return(tmFixedMapping(tms, tms->inpsf*d/Ldmax, gamval, Lddyn)); } int tmMapPixels( /* apply tone-mapping to pixel(s) */ TMstruct *tms, -BYTE *ps, +uby8 *ps, TMbright *ls, -BYTE *cs, +uby8 *cs, int len ) { static const char funcName[] = "tmMapPixels"; - int32 li, pv; + TMbright lv; + TMAP_TYP li; + int pv; if (tms == NULL || tms->lumap == NULL) returnErr(TM_E_TMINVAL); if ((ps == NULL) | (ls == NULL) | (len < 0)) returnErr(TM_E_ILLEGAL); while (len--) { - if ((li = *ls++) < tms->mbrmin) { + if ((lv = *ls++) < tms->mbrmin) { li = 0; } else { - if (li > tms->mbrmax) - li = tms->mbrmax; - li = tms->lumap[li - tms->mbrmin]; + if (lv > tms->mbrmax) + lv = tms->mbrmax; + li = tms->lumap[lv - tms->mbrmin]; } - if (cs == TM_NOCHROM) - *ps++ = li>255 ? 255 : li; - else { + if (cs == TM_NOCHROM) { +#if !(TM_BRES & 0xff) + *ps++ = li>=TM_BRES ? 255 : li/(TM_BRES>>8); +#else + *ps++ = li>=TM_BRES ? 255 : (li<<8)/TM_BRES; +#endif + } else { pv = *cs++ * li / tms->cdiv[RED]; *ps++ = pv>255 ? 255 : pv; pv = *cs++ * li / tms->cdiv[GRN]; @@ -592,7 +605,7 @@ int len TMstruct * -tmDup( /* duplicate top tone mapping */ +tmDup( /* duplicate tone mapping */ TMstruct *tms ) { @@ -608,18 +621,15 @@ TMstruct *tms *tmnew = *tms; /* copy everything */ if (tmnew->histo != NULL) { /* duplicate histogram */ len = HISTI(tmnew->hbrmax) + 1 - HISTI(tmnew->hbrmin); - tmnew->histo = (int *)malloc(len*sizeof(int)); + tmnew->histo = (HIST_TYP *)malloc(len*sizeof(HIST_TYP)); if (tmnew->histo != NULL) - for (i = len; i--; ) - tmnew->histo[i] = tms->histo[i]; + memcpy(tmnew->histo, tms->histo, len*sizeof(HIST_TYP)); } if (tmnew->lumap != NULL) { /* duplicate luminance mapping */ len = tmnew->mbrmax-tmnew->mbrmin+1; - tmnew->lumap = (unsigned short *)malloc( - len*sizeof(unsigned short) ); + tmnew->lumap = (TMAP_TYP *)malloc(len*sizeof(TMAP_TYP)); if (tmnew->lumap != NULL) - for (i = len; i--; ) - tmnew->lumap[i] = tms->lumap[i]; + memcpy(tmnew->lumap, tms->lumap, len*sizeof(TMAP_TYP)); } /* clear package data */ for (i = tmNumPkgs; i--; ) @@ -639,19 +649,19 @@ TMstruct *tms; return; /* free tables */ if (tms->histo != NULL) - free((MEM_PTR)tms->histo); + free(tms->histo); if (tms->lumap != NULL) - free((MEM_PTR)tms->lumap); + free(tms->lumap); /* free private data */ for (i = tmNumPkgs; i--; ) if (tms->pd[i] != NULL) (*tmPkg[i]->Free)(tms->pd[i]); - free((MEM_PTR)tms); /* free basic structure */ + free(tms); /* free basic structure */ } /******************** Shared but Private library routines *********************/ -BYTE tmMesofact[BMESUPPER-BMESLOWER]; +uby8 tmMesofact[BMESUPPER-BMESLOWER]; void tmMkMesofact() /* build mesopic lookup factor table */ @@ -675,16 +685,19 @@ TMstruct *tms { if (tms->lumap != NULL && (tms->mbrmax - tms->mbrmin) != (tms->hbrmax - tms->hbrmin)) { - free((MEM_PTR)tms->lumap); + free(tms->lumap); tms->lumap = NULL; } tms->mbrmin = tms->hbrmin; tms->mbrmax = tms->hbrmax; if (tms->mbrmin > tms->mbrmax) - return 0; + return(0); if (tms->lumap == NULL) - tms->lumap = (unsigned short *)malloc(sizeof(unsigned short)* - (tms->mbrmax-tms->mbrmin+1)); + tms->lumap = (TMAP_TYP *)calloc(tms->mbrmax-tms->mbrmin+1, + sizeof(TMAP_TYP)); + else + memset(tms->lumap, 0, (tms->mbrmax-tms->mbrmin+1)*sizeof(TMAP_TYP)); + return(tms->lumap != NULL); }