ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/tonemap.h
(Generate patch)

Comparing ray/src/common/tonemap.h (file contents):
Revision 3.1 by greg, Tue Apr 15 16:53:03 1997 UTC vs.
Revision 3.9 by gwlarson, Mon Oct 5 16:49:52 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Regents of the University of California */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3 < /* SCCSid "$SunId$ LBL" */
3 > /* SCCSid "$SunId$ SGI" */
4  
5   /*
6   * Header file for tone mapping functions.
7 + *
8 + * Include after "color.h"
9   */
8 –                                /* required non-system header files */
9 – #include        "color.h"
10  
11 +
12   /****    Argument Macros    ****/
13                                  /* Flags of what to do */
14   #define TM_F_HCONTR     01              /* human contrast sensitivity */
# Line 18 | Line 19
19   #define TM_F_CWEIGHT    040             /* center weighting */
20   #define TM_F_FOVEAL     0100            /* use foveal sample size */
21   #define TM_F_BW         0200            /* luminance only */
22 < #define TM_F_NOERRS     0400            /* don't report errors to stderr */
22 > #define TM_F_NOSTDERR   0400            /* don't report errors to stderr */
23                                  /* combined modes */
24   #define TM_F_CAMERA     0
25   #define TM_F_HUMAN      (TM_F_HCONTR|TM_F_MESOPIC|TM_F_VEIL|\
# Line 31 | Line 32
32   #define TM_NOCHROMP     (BYTE **)NULL   /* indicate no chrominances */
33   #define TM_GETFILE      (FILE *)NULL    /* indicate file must be opened */
34  
35 +
36   /****    Error Return Values    ****/
37  
38   #define TM_E_OK         0               /* normal return status */
# Line 39 | Line 41
41   #define TM_E_TMINVAL    3               /* no valid tone mapping */
42   #define TM_E_TMFAIL     4               /* cannot compute tone mapping */
43   #define TM_E_BADFILE    5               /* cannot open or understand file */
44 + #define TM_E_CODERR1    6               /* code consistency error 1 */
45 + #define TM_E_CODERR2    7               /* code consistency error 2 */
46  
47 +
48   /****    Conversion Constants and Table Sizes    ****/
49  
50   #define TM_BRTSCALE     128             /* brightness scale factor (integer) */
51  
52 < #define TM_GAMTSZ       1024            /* gamma lookup table size */
52 > #define TM_MAXPKG       8               /* maximum number of color formats */
53  
49 – /****    Global Data Structures    ****/
54  
55 + /****    Global Data Types and Structures    ****/
56 +
57 + #ifndef MEM_PTR
58 + #define MEM_PTR         void *
59 + #endif
60 +
61   extern char     *tmErrorMessage[];      /* error messages */
62 + extern int      tmLastError;            /* last error incurred by library */
63 + extern char     *tmLastFunction;        /* error-generating function name */
64  
65   typedef short   TMbright;               /* encoded luminance type */
66  
# Line 57 | Line 69 | extern struct tmStruct {
69          int             flags;          /* flags of what to do */
70          RGBPRIMP        monpri;         /* monitor RGB primaries */
71          double          mongam;         /* monitor gamma value (approx.) */
60 –        BYTE            gamb[TM_GAMTSZ];/* gamma lookup table from mongam */
72          COLOR           clf;            /* computed luminance coefficients */
73 <        COLR            clfb;           /* normalized version of clf */
73 >        int             cdiv[3];        /* computed color divisors */
74          RGBPRIMP        inppri;         /* current input primaries */
75          double          inpsf;          /* current input scalefactor */
65 –        TMbright        inpsfb;         /* encoded version of inpsf */
76          COLORMAT        cmat;           /* color conversion matrix */
77 <        TMbright        brmin, brmax;   /* input brightness limits */  
77 >        TMbright        hbrmin, hbrmax; /* histogram brightness limits */      
78          int             *histo;         /* input histogram */
79 +        TMbright        mbrmin, mbrmax; /* mapped brightness limits */
80          unsigned short  *lumap;         /* computed luminance map */
81          struct tmStruct *tmprev;        /* previous tone mapping */
82 +        MEM_PTR         pd[TM_MAXPKG];  /* pointers to private data */
83   }       *tmTop;                 /* current tone mapping stack */
84 <
84 >
85 >                                /* conversion package functions */
86 > #ifdef  NOPROTO
87 > struct tmPackage {
88 >        MEM_PTR         (*Init)();      /* initialize private data */
89 >        void            (*NewSpace)();  /* new input color space (optional) */
90 >        void            (*Free)();      /* free private data */
91 > };
92 > #else
93 > struct tmPackage {
94 >        MEM_PTR         (*Init)(struct tmStruct *tms);
95 >        int             (*NewSpace)(struct tmStruct *tms);
96 >        void            (*Free)(MEM_PTR pp);
97 > };
98 > #endif
99 >                                /* our list of conversion packages */
100 > extern struct tmPackage *tmPkg[TM_MAXPKG];
101 > extern int      tmNumPkgs;      /* number of registered packages */
102 >
103 >
104   /****    Useful Macros    ****/
105  
106 +                                /* compute luminance from encoded value */
107   #define tmLuminance(li) exp((li)/(double)TM_BRTSCALE)
108  
109 +                                /* does tone mapping need color matrix? */
110 + #define tmNeedMatrix(t) ((t)->monpri != (t)->inppri)
111 +
112 +                                /* register a conversion package */
113 + #define tmRegPkg(pf)    ( tmNumPkgs >= TM_MAXPKG ? -1 : \
114 +                                (tmPkg[tmNumPkgs] = (pf), tmNumPkgs++) )
115 +
116 +                                /* get the specific package's data */
117 + #define tmPkgData(t,i)  ((t)->pd[i]!=NULL ? (t)->pd[i] : (*tmPkg[i]->Init)(t))
118 +
119 +
120   /****    Library Function Calls    ****/
121  
122 < #ifdef NOPROTO
122 > #ifdef  NOPROTO
123  
124 < extern struct tmStruct  *tmInit(), *tmPop();
124 > extern struct tmStruct  *tmInit(), *tmPop(), *tmDup();
125   extern void     tmClearHisto(), tmDone();
126   extern int      tmSetSpace(), tmCvColors(), tmCvColrs();
127   extern int      tmAddHisto(), tmComputeMapping(), tmMapPixels();
# Line 156 | Line 199 | tmAddHisto(TMbright *ls, int len, int wt);
199   extern int
200   tmComputeMapping(double gamval, double Lddyn, double Ldmax);
201   /*
202 <        Compute tone mapping function.
202 >        Compute tone mapping function.  This mapping will be used
203 >        in subsequent calls to tmMapPixels() until a new tone mapping
204 >        is computed.  I.e., calls to tmAddHisto() have no immediate effect.
205  
206          gamval  -       display gamma response (0. for default).
207          Lddyn   -       the display's dynamic range (0. for default).
# Line 183 | Line 228 | tmLoadPicture(TMbright **lpp, BYTE **cpp, int *xp, int
228                  char *fname, FILE *fp);
229   /*
230          Load Radiance picture and convert to tone mapping representation.
231 +        Memory for the luminance and chroma arrays is allocated using
232 +        malloc(3), and should be freed with free(3) when no longer needed.
233 +        Calls tmSetSpace() to calibrate input color space.
234  
235 <        lpp     -       returned array of encoded luminances, English ordering.
235 >        lpp     -       returned array of encoded luminances, picture ordering.
236          cpp     -       returned array of encoded chrominances (Note 2).
237          xp, yp  -       returned picture dimensions.
238          fname   -       picture file name.
# Line 203 | Line 251 | tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
251          If fp is TM_GETFILE and (flags&TM_F_UNIMPL)!=0, tmMapPicture()
252          calls pcond to perform the actual conversion, which takes
253          longer but gives access to all the TM_F_* features.
254 +        Memory for the final pixel array is allocated using malloc(3),
255 +        and should be freed with free(3) when it is no longer needed.
256  
257 <        psp     -       returned array of tone mapped pixels, English ordering.
257 >        psp     -       returned array of tone mapped pixels, picture ordering.
258          xp, yp  -       returned picture dimensions.
259          flags   -       TM_F_* flags indicating what is to be done.
260          monpri  -       display monitor primaries (Note 1).
# Line 245 | Line 295 | tmPush(struct tmStruct *tms);
295          returns -       0 on success, TM_E_* if tms is invalid.
296   */
297  
298 + extern struct tmStruct *
299 + tmDup(void);
300 + /*
301 +        Duplicate the current tone mapping into a new structure on the stack.
302 +
303 +        returns -       pointer to new top, or NULL on error.
304 + */
305 +
306   extern void
307   tmDone(struct tmStruct *tms);
308   /*
# Line 258 | Line 316 | tmDone(struct tmStruct *tms);
316   */
317  
318   #endif
319 <
319 >
320 >
321   /****    Notes    ****/
322   /*
323          General:
# Line 267 | Line 326 | tmDone(struct tmStruct *tms);
326          pixel values to chroma and luminance encodings, which can
327          be passed to tmAddHisto() to put into the tone mapping histogram.
328          This histogram is then used along with the display parameters
329 <        by tmComputMapping() to compute the luminance mapping function.
329 >        by tmComputeMapping() to compute the luminance mapping function.
330          (Colors are tone-mapped as they are converted if TM_F_MESOPIC
331          is set.)  The encoded chroma and luminance values may then be
332          passed to tmMapPixels() to apply the computed tone mapping in
# Line 280 | Line 339 | tmDone(struct tmStruct *tms);
339          used during final mapping, setting the cs parameter to TM_NOCHROM
340          on the first pass will save time.)  Another memory saving option
341          if third and subsequent passes are not needed is to use the
342 <        same array to store the mapped pixels as is used to store
342 >        same array to store the mapped pixels as used to store
343          the encoded chroma values.  This way, only two extra bytes
344          for storing encoded luminances are required per pixel.  This
345          is the method employed by tmMapPicture(), for example.

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines