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.17 by greg, Fri Jan 7 20:33:02 2005 UTC vs.
Revision 3.32 by greg, Sat Jan 15 16:57:46 2022 UTC

# Line 7 | Line 7
7   #ifndef _RAD_TONEMAP_H_
8   #define _RAD_TONEMAP_H_
9  
10 < #include        "tifftypes.h"
10 > #include        "tiff.h"        /* needed for int32, etc. */
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 32 | Line 32 | extern "C" {
32  
33                                  /* special pointer values */
34   #define TM_XYZPRIM      (RGBPRIMP)NULL  /* indicate XYZ primaries (Note 1) */
35 < #define TM_NOCHROM      (BYTE *)NULL    /* indicate no chrominance */
36 < #define TM_NOCHROMP     (BYTE **)NULL   /* indicate no chrominances */
35 > #define TM_NOCHROM      (uby8 *)NULL    /* indicate no chrominance */
36 > #define TM_NOCHROMP     (uby8 **)NULL   /* indicate no chrominances */
37   #define TM_GETFILE      (FILE *)NULL    /* indicate file must be opened */
38  
39  
# Line 51 | Line 51 | extern "C" {
51  
52   /****    Conversion Constants and Table Sizes    ****/
53  
54 < #define TM_BRTSCALE     128             /* brightness scale factor (integer) */
54 > #define TM_BRTSCALE     256             /* brightness scale factor (integer) */
55  
56 < #define TM_NOBRT        (-1<<15)        /* bogus brightness value */
56 > #define TM_NOBRT        (~0x7fff)       /* bogus brightness value */
57   #define TM_NOLUM        (1e-17)         /* ridiculously small luminance */
58  
59 + #define TM_BRES         4096            /* luminance tone-map resolution */
60 +
61   #define TM_MAXPKG       8               /* maximum number of color formats */
62  
63  
64   /****    Global Data Types and Structures    ****/
65  
66 < #ifndef MEM_PTR
67 < #define MEM_PTR         void *
66 > #ifndef HIST_TYP
67 > #define HIST_TYP        unsigned long
68   #endif
69 + #ifndef TMAP_TYP
70 + #define TMAP_TYP        uint16
71 + #endif
72  
73   extern char     *tmErrorMessage[];      /* error messages */
69 – extern int      tmLastError;            /* last error incurred by library */
70 – extern char     *tmLastFunction;        /* error-generating function name */
74  
75   typedef short   TMbright;               /* encoded luminance type */
76  
77                                  /* basic tone mapping data structure */
78 < typedef struct tmStruct {
78 > typedef struct {
79          int             flags;          /* flags of what to do */
80          RGBPRIMP        monpri;         /* monitor RGB primaries */
81          double          mongam;         /* monitor gamma value (approx.) */
# Line 80 | Line 83 | typedef struct tmStruct {
83          int             cdiv[3];        /* computed color divisors */
84          RGBPRIMP        inppri;         /* current input primaries */
85          double          inpsf;          /* current input scalefactor */
86 +        void            *inpdat;        /* current input client data */
87          COLORMAT        cmat;           /* color conversion matrix */
88          TMbright        hbrmin, hbrmax; /* histogram brightness limits */      
89 <        int             *histo;         /* input histogram */
89 >        HIST_TYP        *histo;         /* input histogram */
90          TMbright        mbrmin, mbrmax; /* mapped brightness limits */
91 <        unsigned short  *lumap;         /* computed luminance map */
92 <        MEM_PTR         pd[TM_MAXPKG];  /* pointers to private data */
91 >        TMAP_TYP        *lumap;         /* computed luminance map */
92 >        void            *pd[TM_MAXPKG]; /* pointers to private data */
93 >        int             lastError;      /* last error incurred */
94 >        const char      *lastFunc;      /* error-generating function name */
95   } TMstruct;
96  
97                                  /* conversion package functions */
98   struct tmPackage {
99 <        MEM_PTR         (*Init)(TMstruct *tms);
99 >        void *          (*Init)(TMstruct *tms);
100          void            (*NewSpace)(TMstruct *tms);
101 <        void            (*Free)(MEM_PTR pp);
101 >        void            (*Free)(void *pp);
102   };
103                                  /* our list of conversion packages */
104   extern struct tmPackage *tmPkg[TM_MAXPKG];
# Line 117 | Line 123 | extern int     tmNumPkgs;      /* number of registered packages
123  
124   /****    Library Function Calls    ****/
125  
126 + extern TMbright
127 + tmCvLuminance(double lum);
128 + /*
129 +        Convert a single luminance value to an encoded brightness value.
130 + */
131  
132 + extern int
133 + tmCvLums(TMbright *ls, float *scan, int len);
134 + /*
135 +        Convert luminance values to encoded brightness values using lookup.
136 +
137 +        ls      -       returned encoded luminance values.
138 +        scan    -       input scanline.
139 +        len     -       scanline length.
140 +
141 +        returns -       0 on success, TM_E_* on error.
142 + */
143 +
144   extern TMstruct *
145   tmInit(int flags, RGBPRIMP monpri, double gamval);
146   /*
# Line 131 | Line 154 | tmInit(int flags, RGBPRIMP monpri, double gamval);
154   */
155  
156   extern int
157 < tmSetSpace(TMstruct *tms, RGBPRIMP pri, double sf);
157 > tmSetSpace(TMstruct *tms, RGBPRIMP pri, double sf, void *dat);
158   /*
159          Set color primaries and scale factor for incoming scanlines.
160  
161          tms     -       tone mapping structure pointer.
162          pri     -       RGB color input primaries (Note 1).
163          sf      -       scale factor to get to luminance in cd/m^2.
164 +        dat     -       application-specific data (NULL if not needed)
165  
166          returns -       0 on success, TM_E_* code on failure.
167   */
# Line 164 | Line 188 | tmAddHisto(TMstruct *tms, TMbright *ls, int len, int w
188   */
189  
190   extern int
191 < tmFixedMapping(TMstruct *tms, double expmult, double gamval);
191 > tmFixedMapping(TMstruct *tms, double expmult, double gamval, double Lddyn);
192   /*
193          Assign a fixed, linear tone-mapping using the given multiplier,
194          which is the ratio of maximum output to uncalibrated input.
# Line 175 | Line 199 | tmFixedMapping(TMstruct *tms, double expmult, double g
199          tms     -       tone mapping structure pointer.
200          expmult -       the fixed exposure multiplier to use.
201          gamval  -       display gamma response (0. for default).
202 +        Lddyn   -       the display's dynamic range (0. for default).
203 +
204          returns -       0 on success, TM_E_* on error.
205   */
206  
# Line 195 | Line 221 | tmComputeMapping(TMstruct *tms, double gamval, double
221   */
222  
223   extern int
224 < tmMapPixels(TMstruct *tms, BYTE *ps, TMbright *ls, BYTE *cs, int len);
224 > tmMapPixels(TMstruct *tms, uby8 *ps, TMbright *ls, uby8 *cs, int len);
225   /*
226          Apply tone mapping function to pixel values.
227  
# Line 214 | Line 240 | tmDup(TMstruct *orig);
240          Duplicate the given tone mapping into a new struct.
241  
242          orig    -       tone mapping structure to duplicate.
243 +
244          returns -       pointer to new struct, or NULL on error.
245   */
246  
# Line 226 | Line 253 | tmDone(TMstruct *tms);
253   */
254  
255   extern int
256 < tmCvColors(TMstruct *tms, TMbright *ls, BYTE *cs, COLOR *scan, int len);
256 > tmCvGrays(TMstruct *tms, TMbright *ls, float *scan, int len);
257   /*
258 <        Convert RGB/XYZ float scanline to encoded luminance and chrominance.
258 >        Convert gray float scanline to encoded luminance.
259  
260          tms     -       tone mapping structure pointer.
261          ls      -       returned encoded luminance values.
235 –        cs      -       returned encoded chrominance values (Note 2).
262          scan    -       input scanline.
263          len     -       scanline length.
264  
# Line 240 | Line 266 | tmCvColors(TMstruct *tms, TMbright *ls, BYTE *cs, COLO
266   */
267  
268   extern int
269 < tmCvGrays(TMstruct *tms, TMbright *ls, float *scan, int len);
269 > tmCvColors(TMstruct *tms, TMbright *ls, uby8 *cs, COLOR *scan, int len);
270   /*
271 <        Convert gray float scanline to encoded luminance.
271 >        Convert RGB/XYZ float scanline to encoded luminance and chrominance.
272  
273          tms     -       tone mapping structure pointer.
274          ls      -       returned encoded luminance values.
275 +        cs      -       returned encoded chrominance values (Note 2).
276          scan    -       input scanline.
277          len     -       scanline length.
278  
# Line 253 | Line 280 | tmCvGrays(TMstruct *tms, TMbright *ls, float *scan, in
280   */
281  
282   extern int
283 < tmCvColrs(TMstruct *tms, TMbright *ls, BYTE *cs, COLR *scan, int len);
283 > tmCvColrs(TMstruct *tms, TMbright *ls, uby8 *cs, COLR *scan, int len);
284   /*
285          Convert RGBE/XYZE scanline to encoded luminance and chrominance.
286  
# Line 267 | Line 294 | tmCvColrs(TMstruct *tms, TMbright *ls, BYTE *cs, COLR
294   */
295  
296   extern int
297 < tmLoadPicture(TMstruct *tms, TMbright **lpp, BYTE **cpp, int *xp, int *yp,
297 > tmLoadPicture(TMstruct *tms, TMbright **lpp, uby8 **cpp, int *xp, int *yp,
298                  char *fname, FILE *fp);
299   /*
300          Load Radiance picture and convert to tone mapping representation.
# Line 286 | Line 313 | tmLoadPicture(TMstruct *tms, TMbright **lpp, BYTE **cp
313   */
314  
315   extern int
316 < tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
316 > tmMapPicture(uby8 **psp, int *xp, int *yp, int flags,
317                  RGBPRIMP monpri, double gamval, double Lddyn, double Ldmax,
318                  char *fname, FILE *fp);
319   /*
# Line 311 | Line 338 | tmMapPicture(BYTE **psp, int *xp, int *yp, int flags,
338   */
339  
340   extern int
341 < tmCvRGB48(TMstruct *tms, TMbright *ls, BYTE *cs, uint16 (*scan)[3],
341 > tmCvRGB48(TMstruct *tms, TMbright *ls, uby8 *cs, uint16 (*scan)[3],
342                  int len, double gv);
343   /*
344          Convert 48-bit RGB scanline to encoded luminance and chrominance.

Diff Legend

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