| openjpeg.h (2.2.0) | | openjpeg.h (2.3.0) | |
| | | | |
| skipping to change at line 382 | | skipping to change at line 382 | |
| /** csty : coding style */ | | /** csty : coding style */ | |
| int csty; | | int csty; | |
| /** progression order (default OPJ_LRCP) */ | | /** progression order (default OPJ_LRCP) */ | |
| OPJ_PROG_ORDER prog_order; | | OPJ_PROG_ORDER prog_order; | |
| /** progression order changes */ | | /** progression order changes */ | |
| opj_poc_t POC[32]; | | opj_poc_t POC[32]; | |
| /** number of progression order changes (POC), default to 0 */ | | /** number of progression order changes (POC), default to 0 */ | |
| OPJ_UINT32 numpocs; | | OPJ_UINT32 numpocs; | |
| /** number of layers */ | | /** number of layers */ | |
| int tcp_numlayers; | | int tcp_numlayers; | |
|
| /** rates of layers - might be subsequently limited by the max_cs_size | | /** rates of layers - might be subsequently limited by the max_cs_size | |
| field */ | | field. | |
| | | * Should be decreasing. 1 can be | |
| | | * used as last value to indicate the last layer is lossless. */ | |
| float tcp_rates[100]; | | float tcp_rates[100]; | |
|
| /** different psnr for successive layers */ | | /** different psnr for successive layers. Should be increasing. 0 can b | |
| | | e | |
| | | * used as last value to indicate the last layer is lossless. */ | |
| float tcp_distoratio[100]; | | float tcp_distoratio[100]; | |
| /** number of resolutions */ | | /** number of resolutions */ | |
| int numresolution; | | int numresolution; | |
| /** initial code block width, default to 64 */ | | /** initial code block width, default to 64 */ | |
| int cblockw_init; | | int cblockw_init; | |
| /** initial code block height, default to 64 */ | | /** initial code block height, default to 64 */ | |
| int cblockh_init; | | int cblockh_init; | |
| /** mode switch (cblk_style) */ | | /** mode switch (cblk_style) */ | |
| int mode; | | int mode; | |
| /** 1 : use the irreversible DWT 9-7, 0 : use lossless compression (def
ault) */ | | /** 1 : use the irreversible DWT 9-7, 0 : use lossless compression (def
ault) */ | |
| | | | |
| skipping to change at line 864 | | skipping to change at line 867 | |
| /** | | /** | |
| * Tile-component coding parameters information | | * Tile-component coding parameters information | |
| */ | | */ | |
| typedef struct opj_tccp_info { | | typedef struct opj_tccp_info { | |
| /** component index */ | | /** component index */ | |
| OPJ_UINT32 compno; | | OPJ_UINT32 compno; | |
| /** coding style */ | | /** coding style */ | |
| OPJ_UINT32 csty; | | OPJ_UINT32 csty; | |
| /** number of resolutions */ | | /** number of resolutions */ | |
| OPJ_UINT32 numresolutions; | | OPJ_UINT32 numresolutions; | |
|
| /** code-blocks width */ | | /** log2 of code-blocks width */ | |
| OPJ_UINT32 cblkw; | | OPJ_UINT32 cblkw; | |
|
| /** code-blocks height */ | | /** log2 of code-blocks height */ | |
| OPJ_UINT32 cblkh; | | OPJ_UINT32 cblkh; | |
| /** code-block coding style */ | | /** code-block coding style */ | |
| OPJ_UINT32 cblksty; | | OPJ_UINT32 cblksty; | |
| /** discrete wavelet transform identifier: 0 = 9-7 irreversible, 1 = 5-
3 reversible */ | | /** discrete wavelet transform identifier: 0 = 9-7 irreversible, 1 = 5-
3 reversible */ | |
| OPJ_UINT32 qmfbid; | | OPJ_UINT32 qmfbid; | |
| /** quantisation style */ | | /** quantisation style */ | |
| OPJ_UINT32 qntsty; | | OPJ_UINT32 qntsty; | |
| /** stepsizes used for quantization */ | | /** stepsizes used for quantization */ | |
| OPJ_UINT32 stepsizes_mant[OPJ_J2K_MAXBANDS]; | | OPJ_UINT32 stepsizes_mant[OPJ_J2K_MAXBANDS]; | |
| /** stepsizes used for quantization */ | | /** stepsizes used for quantization */ | |
| | | | |
| skipping to change at line 1326 | | skipping to change at line 1329 | |
| * @param p_stream the jpeg2000 stream. | | * @param p_stream the jpeg2000 stream. | |
| * @param p_codec the jpeg2000 codec to read. | | * @param p_codec the jpeg2000 codec to read. | |
| * @param p_image the image structure initialized with the charac
teristics of encoded image. | | * @param p_image the image structure initialized with the charac
teristics of encoded image. | |
| * | | * | |
| * @return true if the main header of the codestream and the JP
2 header is correctly read. | | * @return true if the main header of the codestream and the JP
2 header is correctly read. | |
| */ | | */ | |
| OPJ_API OPJ_BOOL OPJ_CALLCONV opj_read_header(opj_stream_t *p_stream, | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_read_header(opj_stream_t *p_stream, | |
| opj_codec_t *p_codec, | | opj_codec_t *p_codec, | |
| opj_image_t **p_image); | | opj_image_t **p_image); | |
| | | | |
|
| | | /** Restrict the number of components to decode. | |
| | | * | |
| | | * This function should be called after opj_read_header(). | |
| | | * | |
| | | * This function enables to restrict the set of decoded components to the | |
| | | * specified indices. | |
| | | * Note that the current implementation (apply_color_transforms == OPJ_FALS | |
| | | E) | |
| | | * is such that neither the multi-component transform at codestream level, | |
| | | * nor JP2 channel transformations will be applied. | |
| | | * Consequently the indices are relative to the codestream. | |
| | | * | |
| | | * Note: opj_decode_tile_data() should not be used together with opj_set_de | |
| | | coded_components(). | |
| | | * | |
| | | * @param p_codec the jpeg2000 codec to read. | |
| | | * @param numcomps Size of the comps_indices array. | |
| | | * @param comps_indices Array of numcomps values representing the indic | |
| | | es | |
| | | * of the components to decode (relative to the | |
| | | * codestream, starting at 0) | |
| | | * @param apply_color_transforms Whether multi-component transform at cod | |
| | | estream level | |
| | | * or JP2 channel transformations should be | |
| | | applied. | |
| | | * Currently this parameter should be set t | |
| | | o OPJ_FALSE. | |
| | | * Setting it to OPJ_TRUE will result in an | |
| | | error. | |
| | | * | |
| | | * @return OPJ_TRUE in case of success. | |
| | | */ | |
| | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_set_decoded_components(opj_codec_t *p_cod | |
| | | ec, | |
| | | OPJ_UINT32 numcomps, | |
| | | const OPJ_UINT32* comps_indices, | |
| | | OPJ_BOOL apply_color_transforms); | |
| | | | |
| /** | | /** | |
| * Sets the given area to be decoded. This function should be called right
after opj_read_header and before any tile header reading. | | * Sets the given area to be decoded. This function should be called right
after opj_read_header and before any tile header reading. | |
| * | | * | |
|
| | | * The coordinates passed to this function should be expressed in the refer | |
| | | ence grid, | |
| | | * that is to say at the highest resolution level, even if requesting the i | |
| | | mage at lower | |
| | | * resolution levels. | |
| | | * | |
| | | * Generally opj_set_decode_area() should be followed by opj_decode(), and | |
| | | the | |
| | | * codec cannot be re-used. | |
| | | * In the particular case of an image made of a single tile, several sequen | |
| | | ces of | |
| | | * calls to opoj_set_decode_area() and opj_decode() are allowed, and will b | |
| | | ring | |
| | | * performance improvements when reading an image by chunks. | |
| | | * | |
| * @param p_codec the jpeg2000 codec. | | * @param p_codec the jpeg2000 codec. | |
| * @param p_image the decoded image previously setted by opj_read
_header | | * @param p_image the decoded image previously setted by opj_read
_header | |
| * @param p_start_x the left position of the rectangle to decode (i
n image coordinates). | | * @param p_start_x the left position of the rectangle to decode (i
n image coordinates). | |
| * @param p_end_x the right position of the rectangle to decode (
in image coordinates). | | * @param p_end_x the right position of the rectangle to decode (
in image coordinates). | |
| * @param p_start_y the up position of the rectangle to decode (in
image coordinates). | | * @param p_start_y the up position of the rectangle to decode (in
image coordinates). | |
| * @param p_end_y the bottom position of the rectangle to decode
(in image coordinates). | | * @param p_end_y the bottom position of the rectangle to decode
(in image coordinates). | |
| * | | * | |
| * @return true if the area could be set. | | * @return true if the area could be set. | |
| */ | | */ | |
| OPJ_API OPJ_BOOL OPJ_CALLCONV opj_set_decode_area(opj_codec_t *p_codec, | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_set_decode_area(opj_codec_t *p_codec, | |
| | | | |
| skipping to change at line 1432 | | skipping to change at line 1475 | |
| OPJ_UINT32 * p_data_size, | | OPJ_UINT32 * p_data_size, | |
| OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0, | | OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0, | |
| OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1, | | OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1, | |
| OPJ_UINT32 * p_nb_comps, | | OPJ_UINT32 * p_nb_comps, | |
| OPJ_BOOL * p_should_go_on); | | OPJ_BOOL * p_should_go_on); | |
| | | | |
| /** | | /** | |
| * Reads a tile data. This function is compulsory and allows one to decode
tile data. opj_read_tile_header should be called before. | | * Reads a tile data. This function is compulsory and allows one to decode
tile data. opj_read_tile_header should be called before. | |
| * The user may need to refer to the image got by opj_read_header to unders
tand the size being taken by the tile. | | * The user may need to refer to the image got by opj_read_header to unders
tand the size being taken by the tile. | |
| * | | * | |
|
| | | * Note: opj_decode_tile_data() should not be used together with opj_set_de | |
| | | coded_components(). | |
| | | * | |
| * @param p_codec the jpeg2000 codec. | | * @param p_codec the jpeg2000 codec. | |
| * @param p_tile_index the index of the tile being decoded, this shoul
d be the value set by opj_read_tile_header. | | * @param p_tile_index the index of the tile being decoded, this shoul
d be the value set by opj_read_tile_header. | |
| * @param p_data pointer to a memory block that will hold the de
coded data. | | * @param p_data pointer to a memory block that will hold the de
coded data. | |
| * @param p_data_size size of p_data. p_data_size should be bigger or
equal to the value set by opj_read_tile_header. | | * @param p_data_size size of p_data. p_data_size should be bigger or
equal to the value set by opj_read_tile_header. | |
| * @param p_stream the stream to decode. | | * @param p_stream the stream to decode. | |
| * | | * | |
| * @return true if the data could be decoded. | | * @return true if the data could be decoded. | |
| */ | | */ | |
| OPJ_API OPJ_BOOL OPJ_CALLCONV opj_decode_tile_data(opj_codec_t *p_codec, | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_decode_tile_data(opj_codec_t *p_codec, | |
| OPJ_UINT32 p_tile_index, | | OPJ_UINT32 p_tile_index, | |
| | | | |
End of changes. 7 change blocks. |
| 5 lines changed or deleted | | 65 lines changed or added | |
|