diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-05-07 19:18:04 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-05-07 19:18:04 +0400 |
commit | 008863daec1249d1f17bc69e1105e336db690d63 (patch) | |
tree | 78a4001857b26a287125a3f5fa31496052f6ebdd /source/blender/imbuf/IMB_imbuf_types.h | |
parent | 1613829e8e821321da99cad4790b7e6a1d90cea8 (diff) |
Merge image related changes from the render branch. This includes the image
tile cache code in imbuf, but it is not hooked up to the render engine.
Imbuf module: some small refactoring and removing a lot of unused or old code
(about 6.5k lines).
* Added a ImFileType struct with callbacks to make adding an file format type,
or making changes to the API easier.
* Move imbuf init/exit code into IMB_init()/IMB_exit() functions.
* Increased mipmap levels from 10 to 20, you run into this limit already with
a 2k image.
* Removed hamx, amiga, anim5 format support.
* Removed colormap saving, only simple colormap code now for reading tga.
* Removed gen_dynlibtiff.py, editing this is almost as much work as just
editing the code directly.
* Functions removed that were only used for sequencer plugin API:
IMB_anim_nextpic, IMB_clever_double, IMB_antialias, IMB_gamwarp,
IMB_scalefieldImBuf, IMB_scalefastfieldImBuf, IMB_onethird, IMB_halflace,
IMB_dit0, IMB_dit2, IMB_cspace
* Write metadata info into OpenEXR images. Can be viewed with the command
line utility 'exrheader'
For the image tile cache code, see this page:
http://wiki.blender.org/index.php/Dev:2.5/Source/Imaging/ImageTileCache
Diffstat (limited to 'source/blender/imbuf/IMB_imbuf_types.h')
-rw-r--r-- | source/blender/imbuf/IMB_imbuf_types.h | 202 |
1 files changed, 77 insertions, 125 deletions
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index 6c58641a0d5..e0dcc344016 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -48,14 +48,10 @@ #ifndef IMB_IMBUF_TYPES_H #define IMB_IMBUF_TYPES_H -#include <stdio.h> /* for size_t */ -#include "DNA_listBase.h" /* for ListBase */ -struct _AviMovie; -struct Mdec; +struct ImMetaData; -struct ImgInfo; - -#define IB_MIPMAP_LEVELS 10 +#define IB_MIPMAP_LEVELS 20 +#define IB_FILENAME_SIZE 1023 /** * \brief The basic imbuf type @@ -73,56 +69,69 @@ struct ImgInfo; */ typedef struct ImBuf { struct ImBuf *next, *prev; /**< allow lists of ImBufs, for caches or flipbooks */ - short x, y; /**< width and Height of our image buffer */ - short skipx; /**< Width in ints to get to the next scanline */ - unsigned char depth; /**< Active amount of bits/bitplanes */ - unsigned char cbits; /**< Amount of active bits in cmap */ - unsigned short mincol; /**< smallest color in colormap */ - unsigned short maxcol; /**< Largest color in colormap */ - int type; /**< 0=abgr, 1=bitplanes */ - int ftype; /**< File type we are going to save as */ - unsigned int *cmap; /**< Color map data. */ - unsigned int *rect; /**< pixel values stored here */ - unsigned int *crect; /**< color corrected pixel values stored here */ - unsigned int **planes; /**< bitplanes */ - int flags; /**< Controls which components should exist. */ - int mall; /**< what is malloced internal, and can be freed */ - short xorig, yorig; /**< Cordinates of first pixel of an image used in some formats (example: targa) */ - char name[1023]; /**< The file name assocated with this image */ - char namenull; /**< Unused don't want to remove it thought messes things up */ - int userflags; /**< Used to set imbuf to Dirty and other stuff */ - int *zbuf; /**< z buffer data, original zbuffer */ - float *zbuf_float; /**< z buffer data, camera coordinates */ - void *userdata; /**< temporary storage, only used by baking at the moment */ - unsigned char *encodedbuffer; /**< Compressed image only used with png currently */ - unsigned int encodedsize; /**< Size of data written to encodedbuffer */ - unsigned int encodedbuffersize; /**< Size of encodedbuffer */ - - float *rect_float; /**< floating point Rect equivalent - Linear RGB color space - may need gamma correction to - sRGB when generating 8bit representations */ - int channels; /**< amount of channels in rect_float (0 = 4 channel default) */ - float dither; /**< random dither value, for conversion from float -> byte rect */ - short profile; /** color space/profile preset that the byte rect buffer represents */ - char profile_filename[256]; /** to be implemented properly, specific filename for custom profiles */ - - struct MEM_CacheLimiterHandle_s * c_handle; /**< handle for cache limiter */ - struct ImgInfo * img_info; - int refcounter; /**< Refcounter for multiple users */ - int index; /**< reference index for ImBuf lists */ + + /* dimensions */ + short x, y; /* width and Height of our image buffer */ + unsigned char depth; /* Active amount of bits/bitplanes */ + int channels; /* amount of channels in rect_float (0 = 4 channel default) */ + + /* flags */ + int flags; /* Controls which components should exist. */ + int mall; /* what is malloced internal, and can be freed */ + + /* pixels */ + unsigned int *rect; /* pixel values stored here */ + unsigned int *crect; /* color corrected pixel values stored here */ + float *rect_float; /* floating point Rect equivalent + Linear RGB color space - may need gamma correction to + sRGB when generating 8bit representations */ - struct ImBuf *mipmap[IB_MIPMAP_LEVELS]; /**< MipMap levels, a series of halved images */ + /* tiled pixel storage */ + int tilex, tiley; + int xtiles, ytiles; + unsigned int **tiles; + + /* zbuffer */ + int *zbuf; /* z buffer data, original zbuffer */ + float *zbuf_float; /* z buffer data, camera coordinates */ + + /* parameters used by conversion between byte and float */ + float dither; /* random dither value, for conversion from float -> byte rect */ + short profile; /* color space/profile preset that the byte rect buffer represents */ + char profile_filename[256]; /* to be implemented properly, specific filename for custom profiles */ + + /* mipmapping */ + struct ImBuf *mipmap[IB_MIPMAP_LEVELS]; /* MipMap levels, a series of halved images */ + int miptot, miplevel; + + /* externally used data */ + int index; /* reference index for ImBuf lists */ + int userflags; /* used to set imbuf to dirty and other stuff */ + struct ImMetaData *metadata; /* image metadata */ + void *userdata; /* temporary storage, only used by baking at the moment */ + + /* file information */ + int ftype; /* file type we are going to save as */ + char name[IB_FILENAME_SIZE]; /* filename associated with this image */ + char cachename[IB_FILENAME_SIZE]; /* full filename used for reading from cache */ + + /* memory cache limiter */ + struct MEM_CacheLimiterHandle_s *c_handle; /* handle for cache limiter */ + int refcounter; /* reference counter for multiple users */ + + /* some parameters to pass along for packing images */ + unsigned char *encodedbuffer; /* Compressed image only used with png currently */ + unsigned int encodedsize; /* Size of data written to encodedbuffer */ + unsigned int encodedbuffersize; /* Size of encodedbuffer */ } ImBuf; /* Moved from BKE_bmfont_types.h because it is a userflag bit mask. */ /** * \brief Flags used internally by blender for imagebuffers */ -typedef enum { - IB_BITMAPFONT = 1 << 0, /* This image is a font */ - IB_BITMAPDIRTY = 1 << 1 /* Image needs to be saved is not the same as filename */ -} ImBuf_userflagsMask; +#define IB_BITMAPFONT (1 << 0) /* this image is a font */ +#define IB_BITMAPDIRTY (1 << 1) /* image needs to be saved is not the same as filename */ /* From iff.h. This was once moved away by Frank, now Nzc moves it * back. Such is the way it is... It is a long list of defines, and @@ -136,33 +145,26 @@ typedef enum { */ /**@{*/ /** \brief Flag defining the components of the ImBuf struct. */ -#define IB_rect (1 << 0) -#define IB_planes (1 << 1) -#define IB_cmap (1 << 2) - -#define IB_vert (1 << 4) -#define IB_freem (1 << 6) -#define IB_test (1 << 7) - -#define IB_ttob (1 << 8) -#define IB_subdlta (1 << 9) -#define IB_fields (1 << 11) -#define IB_zbuf (1 << 13) - -#define IB_mem (1 << 14) -#define IB_rectfloat (1 << 15) -#define IB_zbuffloat (1 << 16) -#define IB_multilayer (1 << 17) -#define IB_imginfo (1 << 18) -#define IB_animdeinterlace (1 << 19) + +#define IB_rect (1 << 0) +#define IB_test (1 << 1) +#define IB_fields (1 << 2) +#define IB_zbuf (1 << 3) +#define IB_mem (1 << 4) +#define IB_rectfloat (1 << 5) +#define IB_zbuffloat (1 << 6) +#define IB_multilayer (1 << 7) +#define IB_metadata (1 << 8) +#define IB_animdeinterlace (1 << 9) +#define IB_tiles (1 << 10) +#define IB_tilecache (1 << 11) +#define IB_premul (1 << 12) /* * The bit flag is stored in the ImBuf.ftype variable. * Note that the lower 10 bits is used for storing custom flags */ -#define AMI (1 << 31) #define PNG (1 << 30) -#define Anim (1 << 29) #define TGA (1 << 28) #define JPG (1 << 27) #define BMP (1 << 26) @@ -188,11 +190,11 @@ typedef enum { #ifdef WITH_OPENJPEG #define JP2 (1 << 18) -#define JP2_12BIT (1 << 17) -#define JP2_16BIT (1 << 16) +#define JP2_12BIT (1 << 17) +#define JP2_16BIT (1 << 16) #define JP2_YCC (1 << 15) -#define JP2_CINE (1 << 14) -#define JP2_CINE_48FPS (1 << 13) +#define JP2_CINE (1 << 14) +#define JP2_CINE_48FPS (1 << 13) #endif #define RAWTGA (TGA | 1) @@ -203,66 +205,16 @@ typedef enum { #define JPG_MAX (JPG | (3 << 8)) #define JPG_MSK (0xffffff00) -#define AM_ham (0x0800 | AMI) -#define AM_hbrite (0x0080 | AMI) - -#define C233 1 -#define YUVX 2 -#define HAMX 3 -#define TANX 4 - -#define AN_c233 (Anim | C233) -#define AN_yuvx (Anim | YUVX) -#define AN_hamx (Anim | HAMX) -#define AN_tanx (Anim | TANX) -/**@}*/ +#define IMAGIC 0732 /** * \name Imbuf preset profile tags * \brief Some predefined color space profiles that 8 bit imbufs can represent */ -/**@{*/ #define IB_PROFILE_NONE 0 #define IB_PROFILE_LINEAR_RGB 1 #define IB_PROFILE_SRGB 2 #define IB_PROFILE_CUSTOM 3 -/**@}*/ - - -/** \name Imbuf File Type Tests - * \brief These macros test if an ImBuf struct is the corresponding file type. - */ -/**@{*/ -/** \brief Tests the ImBuf.ftype variable for the file format. */ -#define IS_amiga(x) (x->ftype & AMI) -#define IS_ham(x) ((x->ftype & AM_ham) == AM_ham) -#define IS_hbrite(x) ((x->ftype & AM_hbrite) == AM_hbrite) - -#define IS_anim(x) (x->ftype & Anim) -#define IS_hamx(x) (x->ftype == AN_hamx) -#define IS_tga(x) (x->ftype & TGA) -#define IS_png(x) (x->ftype & PNG) -#define IS_openexr(x) (x->ftype & OPENEXR) -#define IS_jp2(x) (x->ftype & JP2) -#define IS_cineon(x) (x->ftype & CINEON) -#define IS_dpx(x) (x->ftype & DPX) -#define IS_bmp(x) (x->ftype & BMP) -#define IS_tiff(x) (x->ftype & TIF) -#define IS_radhdr(x) (x->ftype & RADHDR) - -#ifdef WITH_DDS -#define IS_dds(x) (x->ftype & DDS) -#endif - -#define IMAGIC 0732 -#define IS_iris(x) (x->ftype == IMAGIC) - -#define IS_jpg(x) (x->ftype & JPG) -#define IS_stdjpg(x) ((x->ftype & JPG_MSK) == JPG_STD) -#define IS_vidjpg(x) ((x->ftype & JPG_MSK) == JPG_VID) -#define IS_jstjpg(x) ((x->ftype & JPG_MSK) == JPG_JST) -#define IS_maxjpg(x) ((x->ftype & JPG_MSK) == JPG_MAX) -/**@}*/ #endif |