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.14 by greg, Fri Jun 27 06:53:22 2003 UTC vs.
Revision 3.22 by greg, Wed May 10 15:21:58 2006 UTC

# Line 6 | Line 6
6   */
7   #ifndef _RAD_TONEMAP_H_
8   #define _RAD_TONEMAP_H_
9 +
10 + #include        "tifftypes.h"
11 +
12   #ifdef __cplusplus
13   extern "C" {
14   #endif
15  
16   /****    Argument Macros    ****/
17 <                                /* Flags of what to do */
17 >                                /* flags of what to do */
18   #define TM_F_HCONTR     01              /* human contrast sensitivity */
19   #define TM_F_MESOPIC    02              /* mesopic color sensitivity */
20   #define TM_F_LINEAR     04              /* linear brightness mapping */
# Line 63 | Line 66 | extern "C" {
66   #endif
67  
68   extern char     *tmErrorMessage[];      /* error messages */
66 – extern int      tmLastError;            /* last error incurred by library */
67 – extern char     *tmLastFunction;        /* error-generating function name */
69  
70   typedef short   TMbright;               /* encoded luminance type */
71  
72                                  /* basic tone mapping data structure */
73 < extern struct tmStruct {
73 > typedef struct {
74          int             flags;          /* flags of what to do */
75          RGBPRIMP        monpri;         /* monitor RGB primaries */
76          double          mongam;         /* monitor gamma value (approx.) */
# Line 77 | Line 78 | extern struct tmStruct {
78          int             cdiv[3];        /* computed color divisors */
79          RGBPRIMP        inppri;         /* current input primaries */
80          double          inpsf;          /* current input scalefactor */
81 +        MEM_PTR         inpdat;         /* current input client data */
82          COLORMAT        cmat;           /* color conversion matrix */
83          TMbright        hbrmin, hbrmax; /* histogram brightness limits */      
84          int             *histo;         /* input histogram */
85          TMbright        mbrmin, mbrmax; /* mapped brightness limits */
86          unsigned short  *lumap;         /* computed luminance map */
85 –        struct tmStruct *tmprev;        /* previous tone mapping */
87          MEM_PTR         pd[TM_MAXPKG];  /* pointers to private data */
88 < }       *tmTop;                 /* current tone mapping stack */
88 >        int             lastError;      /* last error incurred */
89 >        const char      *lastFunc;      /* error-generating function name */
90 > } TMstruct;
91  
92                                  /* conversion package functions */
93   struct tmPackage {
94 <        MEM_PTR         (*Init)(struct tmStruct *tms);
95 <        void            (*NewSpace)(struct tmStruct *tms);
94 >        MEM_PTR         (*Init)(TMstruct *tms);
95 >        void            (*NewSpace)(TMstruct *tms);
96          void            (*Free)(MEM_PTR pp);
97   };
98                                  /* our list of conversion packages */
# Line 115 | Line 118 | extern int     tmNumPkgs;      /* number of registered packages
118  
119   /****    Library Function Calls    ****/
120  
121 + extern TMbright
122 + tmCvLuminance(double lum);
123 + /*
124 +        Convert a single luminance value to an encoded brightness value.
125 + */
126  
127 < extern struct tmStruct *
127 > extern int
128 > tmCvLums(TMbright *ls, float *scan, int len);
129 > /*
130 >        Convert luminance values to encoded brightness values using lookup.
131 >
132 >        ls      -       returned encoded luminance values.
133 >        scan    -       input scanline.
134 >        len     -       scanline length.
135 >
136 >        returns -       0 on success, TM_E_* on error.
137 > */
138 >
139 > extern TMstruct *
140   tmInit(int flags, RGBPRIMP monpri, double gamval);
141   /*
142 <        Initialize new tone mapping and push it onto stack.
142 >        Allocate and initialize new tone mapping.
143  
144          flags   -       TM_F_* flags indicating what is to be done.
145          monpri  -       display monitor primaries (Note 1).
146          gamval  -       display gamma response (can be approximate).
147  
148 <        returns -       new tmTop, or NULL if insufficient memory.
148 >        returns -       new tone-mapping pointer, or NULL if no memory.
149   */
150  
151   extern int
152 < tmSetSpace(RGBPRIMP pri, double sf);
152 > tmSetSpace(TMstruct *tms, RGBPRIMP pri, double sf, MEM_PTR dat);
153   /*
154          Set color primaries and scale factor for incoming scanlines.
155  
156 +        tms     -       tone mapping structure pointer.
157          pri     -       RGB color input primaries (Note 1).
158          sf      -       scale factor to get to luminance in cd/m^2.
159 +        dat     -       application-specific data (NULL if not needed)
160  
161          returns -       0 on success, TM_E_* code on failure.
162   */
163  
164   extern void
165 < tmClearHisto(void);
165 > tmClearHisto(TMstruct *tms);
166   /*
167          Clear histogram for current tone mapping.
168 +
169 +        tms     -       tone mapping structure pointer.
170   */
171  
172   extern int
173 < tmAddHisto(TMbright *ls, int len, int wt);
173 > tmAddHisto(TMstruct *tms, TMbright *ls, int len, int wt);
174   /*
175          Add brightness values to current histogram.
176  
177 +        tms     -       tone mapping structure pointer.
178          ls      -       encoded luminance values.
179          len     -       number of luminance values.
180          wt      -       integer weight to use for each value (usually 1 or -1).
# Line 158 | Line 183 | tmAddHisto(TMbright *ls, int len, int wt);
183   */
184  
185   extern int
186 < tmFixedMapping(double expmult, double gamval);
186 > tmFixedMapping(TMstruct *tms, double expmult, double gamval);
187   /*
188          Assign a fixed, linear tone-mapping using the given multiplier,
189          which is the ratio of maximum output to uncalibrated input.
# Line 166 | Line 191 | tmFixedMapping(double expmult, double gamval);
191          until a new tone mapping is computed.
192          Only the min. and max. values are used from the histogram.
193          
194 +        tms     -       tone mapping structure pointer.
195          expmult -       the fixed exposure multiplier to use.
196          gamval  -       display gamma response (0. for default).
197 +
198          returns -       0 on success, TM_E_* on error.
199   */
200  
201   extern int
202 < tmComputeMapping(double gamval, double Lddyn, double Ldmax);
202 > tmComputeMapping(TMstruct *tms, double gamval, double Lddyn, double Ldmax);
203   /*
204          Compute tone mapping function from the current histogram.
205          This mapping will be used in subsequent calls to tmMapPixels()
206          until a new tone mapping is computed.
207          I.e., calls to tmAddHisto() have no immediate effect.
208  
209 +        tms     -       tone mapping structure pointer.
210          gamval  -       display gamma response (0. for default).
211          Lddyn   -       the display's dynamic range (0. for default).
212          Ldmax   -       maximum display luminance in cd/m^2 (0. for default).
# Line 187 | Line 215 | tmComputeMapping(double gamval, double Lddyn, double L
215   */
216  
217   extern int
218 < tmMapPixels(BYTE *ps, TMbright *ls, BYTE *cs, int len);
218 > tmMapPixels(TMstruct *tms, BYTE *ps, TMbright *ls, BYTE *cs, int len);
219   /*
220          Apply tone mapping function to pixel values.
221  
222 +        tms     -       tone mapping structure pointer.
223          ps      -       returned pixel values (Note 2).
224          ls      -       encoded luminance values.
225          cs      -       encoded chrominance values (Note 2).
# Line 199 | Line 228 | tmMapPixels(BYTE *ps, TMbright *ls, BYTE *cs, int len)
228          returns -       0 on success, TM_E_* on failure.
229   */
230  
231 < extern struct tmStruct *
232 < tmPop(void);
231 > extern TMstruct *
232 > tmDup(TMstruct *orig);
233   /*
234 <        Pops current tone mapping from stack.
234 >        Duplicate the given tone mapping into a new struct.
235  
236 <        returns -       pointer to tone mapping structure, or NULL if none.
208 < */
236 >        orig    -       tone mapping structure to duplicate.
237  
238 < extern int
211 < tmPull(struct tmStruct *tms);
212 < /*
213 <        Pull tone mapping from anywhere in stack.
214 <
215 <        tms     -       tone mapping structure to find.
216 <
217 <        returns -       1 if found in stack, 0 otherwise.
238 >        returns -       pointer to new struct, or NULL on error.
239   */
240  
220 – extern int
221 – tmPush(struct tmStruct *tms);
222 – /*
223 –        Make tone mapping active by (pulling it and) pushing it to the top.
224 –
225 –        tms     -       initialized tone mapping structure.
226 –
227 –        returns -       0 on success, TM_E_* if tms is invalid.
228 – */
229 –
230 – extern struct tmStruct *
231 – tmDup(void);
232 – /*
233 –        Duplicate the current tone mapping into a new structure on the stack.
234 –
235 –        returns -       pointer to new top, or NULL on error.
236 – */
237 –
241   extern void
242 < tmDone(struct tmStruct *tms);
242 > tmDone(TMstruct *tms);
243   /*
244          Free data associated with the given tone mapping structure.
242 –        Calls tmPull() first to remove it from the stack if present.
243 –        The calls tmDone(tmPop()), tmDone(tmTop) and tmDone(NULL)
244 –        all have the same effect, which is to remove and free
245 –        the current tone mapping.
245  
246          tms     -       tone mapping structure to free.
247   */
248  
249   extern int
250 < tmCvColors(TMbright *ls, BYTE *cs, COLOR *scan, int len);
250 > tmCvGrays(TMstruct *tms, TMbright *ls, float *scan, int len);
251   /*
252 <        Convert RGB/XYZ float scanline to encoded luminance and chrominance.
252 >        Convert gray float scanline to encoded luminance.
253  
254 +        tms     -       tone mapping structure pointer.
255          ls      -       returned encoded luminance values.
256 –        cs      -       returned encoded chrominance values (Note 2).
256          scan    -       input scanline.
257          len     -       scanline length.
258  
# Line 261 | Line 260 | tmCvColors(TMbright *ls, BYTE *cs, COLOR *scan, int le
260   */
261  
262   extern int
263 < tmCvGrays(TMbright *ls, float *scan, int len);
263 > tmCvColors(TMstruct *tms, TMbright *ls, BYTE *cs, COLOR *scan, int len);
264   /*
265 <        Convert gray float scanline to encoded luminance.
265 >        Convert RGB/XYZ float scanline to encoded luminance and chrominance.
266  
267 +        tms     -       tone mapping structure pointer.
268          ls      -       returned encoded luminance values.
269 +        cs      -       returned encoded chrominance values (Note 2).
270          scan    -       input scanline.
271          len     -       scanline length.
272  
# Line 273 | Line 274 | tmCvGrays(TMbright *ls, float *scan, int len);
274   */
275  
276   extern int
277 < tmCvColrs(TMbright *ls, BYTE *cs, COLR *scan, int len);
277 > tmCvColrs(TMstruct *tms, TMbright *ls, BYTE *cs, COLR *scan, int len);
278   /*
279          Convert RGBE/XYZE scanline to encoded luminance and chrominance.
280  
281 +        tms     -       tone mapping structure pointer.
282          ls      -       returned encoded luminance values.
283          cs      -       returned encoded chrominance values (Note 2).
284          scan    -       input scanline.
# Line 286 | Line 288 | tmCvColrs(TMbright *ls, BYTE *cs, COLR *scan, int len)
288   */
289  
290   extern int
291 < tmLoadPicture(TMbright **lpp, BYTE **cpp, int *xp, int *yp,
291 > tmLoadPicture(TMstruct *tms, TMbright **lpp, BYTE **cpp, int *xp, int *yp,
292                  char *fname, FILE *fp);
293   /*
294          Load Radiance picture and convert to tone mapping representation.
# Line 294 | Line 296 | tmLoadPicture(TMbright **lpp, BYTE **cpp, int *xp, int
296          malloc(3), and should be freed with free(3) when no longer needed.
297          Calls tmSetSpace() to calibrate input color space.
298  
299 +        tms     -       tone mapping structure pointer.
300          lpp     -       returned array of encoded luminances, picture ordering.
301          cpp     -       returned array of encoded chrominances (Note 2).
302          xp, yp  -       returned picture dimensions.
# Line 309 | Line 312 | tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
312                  char *fname, FILE *fp);
313   /*
314          Load and apply tone mapping to Radiance picture.
312 –        Stack is restored to its original state upon return.
315          If fp is TM_GETFILE and (flags&TM_F_UNIMPL)!=0, tmMapPicture()
316          calls pcond to perform the actual conversion, which takes
317          longer but gives access to all the TM_F_* features.
# Line 329 | Line 331 | tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
331          returns -       0 on success, TM_E_* on failure.
332   */
333  
334 + extern int
335 + tmCvRGB48(TMstruct *tms, TMbright *ls, BYTE *cs, uint16 (*scan)[3],
336 +                int len, double gv);
337 + /*
338 +        Convert 48-bit RGB scanline to encoded luminance and chrominance.
339  
340 +        tms     -       tone mapping structure pointer.
341 +        ls      -       returned encoded luminance values.
342 +        cs      -       returned encoded chrominance values (Note 2).
343 +        scan    -       input scanline.
344 +        len     -       scanline length.
345 +        gv      -       input gamma value.
346 +
347 +        returns -       0 on success, TM_E_* on error.
348 + */
349 +
350 + extern int
351 + tmCvGray16(TMstruct *tms, TMbright *ls, uint16 *scan, int len, double gv);
352 + /*
353 +        Convert 16-bit gray scanline to encoded luminance.
354 +
355 +        tms     -       tone mapping structure pointer.
356 +        ls      -       returned encoded luminance values.
357 +        scan    -       input scanline.
358 +        len     -       scanline length.
359 +        gv      -       input gamma value.
360 +
361 +        returns -       0 on success, TM_E_* on error.
362 + */
363  
364   /****    Notes    ****/
365   /*

Diff Legend

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