walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] remove left-over from ->jpip_on implementation. JPIP is now completely removed from openjp2 and openmj2. Document jpip_iptr_offset variable

This commit is contained in:
Mathieu Malaterre 2012-10-15 07:38:10 +00:00
parent fe3c1f9061
commit 75b7104724
12 changed files with 168 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/jp2/opj_compress.c
View File

@ -597,7 +597,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
}; };
/* parse the command line */ /* parse the command line */
const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J" const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:"
#ifdef USE_JPWL #ifdef USE_JPWL
"W:" "W:"
#endif /* USE_JPWL */ #endif /* USE_JPWL */
@ -1449,10 +1449,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
/* <<UniPG */ /* <<UniPG */
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */
case 'J': /* jpip on */
{
parameters->jpip_on = OPJ_TRUE;
}
break; break;
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */

6
src/bin/jpip/opj_jpip_compress.c
View File

@ -599,7 +599,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
}; };
/* parse the command line */ /* parse the command line */
const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J" const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:"
#ifdef USE_JPWL #ifdef USE_JPWL
"W:" "W:"
#endif /* USE_JPWL */ #endif /* USE_JPWL */
@ -1451,10 +1451,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
/* <<UniPG */ /* <<UniPG */
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */
case 'J': /* jpip on */
{
parameters->jpip_on = OPJ_TRUE;
}
break; break;
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */

2
src/lib/openjp2/jp2.c
View File

@ -1415,8 +1415,6 @@ void opj_jp2_setup_encoder( opj_jp2_v2_t *jp2,
} }
jp2->precedence = 0; /* PRECEDENCE */ jp2->precedence = 0; /* PRECEDENCE */
jp2->approx = 0; /* APPROX */ jp2->approx = 0; /* APPROX */
/* jp2->jpip_on = parameters->jpip_on; */
} }
opj_bool opj_jp2_encode(opj_jp2_v2_t *jp2, opj_bool opj_jp2_encode(opj_jp2_v2_t *jp2,

324
src/lib/openjp2/jp2.h
View File

@ -37,48 +37,48 @@
/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */ /** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
/*@{*/ /*@{*/
#define JPIP_JPIP 0x6a706970 /*#define JPIP_JPIP 0x6a706970*/
#define JP2_JP 0x6a502020 /**< JPEG 2000 signature box */ #define JP2_JP 0x6a502020 /**< JPEG 2000 signature box */
#define JP2_FTYP 0x66747970 /**< File type box */ #define JP2_FTYP 0x66747970 /**< File type box */
#define JP2_JP2H 0x6a703268 /**< JP2 header box (super-box) */ #define JP2_JP2H 0x6a703268 /**< JP2 header box (super-box) */
#define JP2_IHDR 0x69686472 /**< Image header box */ #define JP2_IHDR 0x69686472 /**< Image header box */
#define JP2_COLR 0x636f6c72 /**< Colour specification box */ #define JP2_COLR 0x636f6c72 /**< Colour specification box */
#define JP2_JP2C 0x6a703263 /**< Contiguous codestream box */ #define JP2_JP2C 0x6a703263 /**< Contiguous codestream box */
#define JP2_URL 0x75726c20 /**< Data entry URL box */ #define JP2_URL 0x75726c20 /**< Data entry URL box */
#define JP2_PCLR 0x70636c72 /**< Palette box */ #define JP2_PCLR 0x70636c72 /**< Palette box */
#define JP2_CMAP 0x636d6170 /**< Component Mapping box */ #define JP2_CMAP 0x636d6170 /**< Component Mapping box */
#define JP2_CDEF 0x63646566 /**< Channel Definition box */ #define JP2_CDEF 0x63646566 /**< Channel Definition box */
#define JP2_DTBL 0x6474626c /**< Data Reference box */ #define JP2_DTBL 0x6474626c /**< Data Reference box */
#define JP2_BPCC 0x62706363 /**< Bits per component box */ #define JP2_BPCC 0x62706363 /**< Bits per component box */
#define JP2_JP2 0x6a703220 /**< File type fields */ #define JP2_JP2 0x6a703220 /**< File type fields */
/* For the future */ /* For the future */
/* #define JP2_RES 0x72657320 */ /**< Resolution box (super-box) */ /* #define JP2_RES 0x72657320 */ /**< Resolution box (super-box) */
/* #define JP2_JP2I 0x6a703269 */ /**< Intellectual property box */ /* #define JP2_JP2I 0x6a703269 */ /**< Intellectual property box */
/* #define JP2_XML 0x786d6c20 */ /**< XML box */ /* #define JP2_XML 0x786d6c20 */ /**< XML box */
/* #define JP2_UUID 0x75756994 */ /**< UUID box */ /* #define JP2_UUID 0x75756994 */ /**< UUID box */
/* #define JP2_UINF 0x75696e66 */ /**< UUID info box (super-box) */ /* #define JP2_UINF 0x75696e66 */ /**< UUID info box (super-box) */
/* #define JP2_ULST 0x756c7374 */ /**< UUID list box */ /* #define JP2_ULST 0x756c7374 */ /**< UUID list box */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
typedef enum typedef enum
{ {
JP2_STATE_NONE = 0x0, JP2_STATE_NONE = 0x0,
JP2_STATE_SIGNATURE = 0x1, JP2_STATE_SIGNATURE = 0x1,
JP2_STATE_FILE_TYPE = 0x2, JP2_STATE_FILE_TYPE = 0x2,
JP2_STATE_HEADER = 0x4, JP2_STATE_HEADER = 0x4,
JP2_STATE_CODESTREAM = 0x8, JP2_STATE_CODESTREAM = 0x8,
JP2_STATE_END_CODESTREAM = 0x10, JP2_STATE_END_CODESTREAM = 0x10,
JP2_STATE_UNKNOWN = 0x7fffffff /* ISO C restricts enumerator values to range of 'int' */ JP2_STATE_UNKNOWN = 0x7fffffff /* ISO C restricts enumerator values to range of 'int' */
} }
JP2_STATE; JP2_STATE;
typedef enum typedef enum
{ {
JP2_IMG_STATE_NONE = 0x0, JP2_IMG_STATE_NONE = 0x0,
JP2_IMG_STATE_UNKNOWN = 0x7fffffff JP2_IMG_STATE_UNKNOWN = 0x7fffffff
} }
JP2_IMG_STATE; JP2_IMG_STATE;
@ -138,8 +138,8 @@ typedef struct opj_jp2_color
JP2 component JP2 component
*/ */
typedef struct opj_jp2_comps { typedef struct opj_jp2_comps {
int depth; int depth;
int sgnd; int sgnd;
OPJ_UINT32 bpcc; OPJ_UINT32 bpcc;
} opj_jp2_comps_t; } opj_jp2_comps_t;
@ -147,30 +147,29 @@ typedef struct opj_jp2_comps {
JPEG-2000 file format reader/writer JPEG-2000 file format reader/writer
*/ */
typedef struct opj_jp2 { typedef struct opj_jp2 {
/** codec context */ /** codec context */
opj_common_ptr cinfo; opj_common_ptr cinfo;
/** handle to the J2K codec */ /** handle to the J2K codec */
opj_j2k_t *j2k; opj_j2k_t *j2k;
unsigned int w; unsigned int w;
unsigned int h; unsigned int h;
unsigned int numcomps; unsigned int numcomps;
unsigned int bpc; unsigned int bpc;
unsigned int C; unsigned int C;
unsigned int UnkC; unsigned int UnkC;
unsigned int IPR; unsigned int IPR;
unsigned int meth; unsigned int meth;
unsigned int approx; unsigned int approx;
unsigned int enumcs; unsigned int enumcs;
unsigned int precedence; unsigned int precedence;
unsigned int brand; unsigned int brand;
unsigned int minversion; unsigned int minversion;
unsigned int numcl; unsigned int numcl;
unsigned int *cl; unsigned int *cl;
opj_jp2_comps_t *comps; opj_jp2_comps_t *comps;
unsigned int j2k_codestream_offset; unsigned int j2k_codestream_offset;
unsigned int j2k_codestream_length; unsigned int j2k_codestream_length;
opj_bool jpip_on; opj_bool ignore_pclr_cmap_cdef;
opj_bool ignore_pclr_cmap_cdef;
} opj_jp2_t; } opj_jp2_t;
/** /**
@ -178,38 +177,43 @@ JPEG-2000 file format reader/writer
*/ */
typedef struct opj_jp2_v2 typedef struct opj_jp2_v2
{ {
/** handle to the J2K codec */ /** handle to the J2K codec */
struct opj_j2k_v2 *j2k; struct opj_j2k_v2 *j2k;
/** list of validation procedures */ /** list of validation procedures */
struct opj_procedure_list * m_validation_list; struct opj_procedure_list * m_validation_list;
/** list of execution procedures */ /** list of execution procedures */
struct opj_procedure_list * m_procedure_list; struct opj_procedure_list * m_procedure_list;
/* width of image */ /* width of image */
OPJ_UINT32 w; OPJ_UINT32 w;
/* height of image */ /* height of image */
OPJ_UINT32 h; OPJ_UINT32 h;
/* number of components in the image */ /* number of components in the image */
OPJ_UINT32 numcomps; OPJ_UINT32 numcomps;
OPJ_UINT32 bpc; OPJ_UINT32 bpc;
OPJ_UINT32 C; OPJ_UINT32 C;
OPJ_UINT32 UnkC; OPJ_UINT32 UnkC;
OPJ_UINT32 IPR; OPJ_UINT32 IPR;
OPJ_UINT32 meth; OPJ_UINT32 meth;
OPJ_UINT32 approx; OPJ_UINT32 approx;
OPJ_UINT32 enumcs; OPJ_UINT32 enumcs;
OPJ_UINT32 precedence; OPJ_UINT32 precedence;
OPJ_UINT32 brand; OPJ_UINT32 brand;
OPJ_UINT32 minversion; OPJ_UINT32 minversion;
OPJ_UINT32 numcl; OPJ_UINT32 numcl;
OPJ_UINT32 *cl; OPJ_UINT32 *cl;
opj_jp2_comps_t *comps; opj_jp2_comps_t *comps;
/* FIXME: The following two variables are used to save offset
as we write out a JP2 file to disk. This mecanism is not flexible
as codec writers will need to extand those fields as new part
of the standard are implemented.
*/
OPJ_OFF_T j2k_codestream_offset; OPJ_OFF_T j2k_codestream_offset;
OPJ_OFF_T jpip_iptr_offset; OPJ_OFF_T jpip_iptr_offset;
OPJ_UINT32 jp2_state; OPJ_UINT32 jp2_state;
OPJ_UINT32 jp2_img_state; OPJ_UINT32 jp2_img_state;
opj_jp2_color_t color; opj_jp2_color_t color;
opj_bool ignore_pclr_cmap_cdef; opj_bool ignore_pclr_cmap_cdef;
} }
@ -226,10 +230,10 @@ typedef struct opj_jp2_box {
typedef struct opj_jp2_header_handler typedef struct opj_jp2_header_handler
{ {
/* marker value */ /* marker value */
OPJ_UINT32 id; OPJ_UINT32 id;
/* action linked to the marker */ /* action linked to the marker */
opj_bool (*handler) ( opj_jp2_v2_t *jp2, opj_bool (*handler) ( opj_jp2_v2_t *jp2,
OPJ_BYTE *p_header_data, OPJ_BYTE *p_header_data,
OPJ_UINT32 p_header_size, OPJ_UINT32 p_header_size,
opj_event_mgr_t * p_manager); opj_event_mgr_t * p_manager);
@ -239,12 +243,12 @@ opj_jp2_header_handler_t;
typedef struct opj_jp2_img_header_writer_handler typedef struct opj_jp2_img_header_writer_handler
{ {
/* action to perform */ /* action to perform */
OPJ_BYTE* (*handler) (opj_jp2_v2_t *jp2, OPJ_UINT32 * p_data_size); OPJ_BYTE* (*handler) (opj_jp2_v2_t *jp2, OPJ_UINT32 * p_data_size);
/* result of the action : data */ /* result of the action : data */
OPJ_BYTE* m_data; OPJ_BYTE* m_data;
/* size of data */ /* size of data */
OPJ_UINT32 m_size; OPJ_UINT32 m_size;
} }
opj_jp2_img_header_writer_handler_t; opj_jp2_img_header_writer_handler_t;
@ -255,9 +259,9 @@ opj_jp2_img_header_writer_handler_t;
/** /**
* Writes the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box). * Writes the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box).
* *
* @param jp2 the jpeg2000 file codec. * @param jp2 the jpeg2000 file codec.
* @param stream the stream to write data to. * @param stream the stream to write data to.
* @param p_manager user event manager. * @param p_manager user event manager.
* *
* @return true if writing was successful. * @return true if writing was successful.
*/ */
@ -284,8 +288,8 @@ void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters);
*/ */
opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2, opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
opj_stream_private_t *p_stream, opj_stream_private_t *p_stream,
opj_image_t* p_image, opj_image_t* p_image,
opj_event_mgr_t * p_manager); opj_event_mgr_t * p_manager);
/** /**
* Setup the encoder parameters using the current image and using user parameters. * Setup the encoder parameters using the current image and using user parameters.
@ -296,29 +300,29 @@ opj_bool opj_jp2_decode(opj_jp2_v2_t *jp2,
* @param image input filled image * @param image input filled image
* @param p_manager FIXME DOC * @param p_manager FIXME DOC
*/ */
void opj_jp2_setup_encoder( opj_jp2_v2_t *jp2, void opj_jp2_setup_encoder( opj_jp2_v2_t *jp2,
opj_cparameters_t *parameters, opj_cparameters_t *parameters,
opj_image_t *image, opj_image_t *image,
opj_event_mgr_t * p_manager); opj_event_mgr_t * p_manager);
/** /**
Encode an image into a JPEG-2000 file stream Encode an image into a JPEG-2000 file stream
@param jp2 JP2 compressor handle @param jp2 JP2 compressor handle
@param stream Output buffer stream @param stream Output buffer stream
@param p_manager event manager @param p_manager event manager
@return Returns true if successful, returns false otherwise @return Returns true if successful, returns false otherwise
*/ */
opj_bool opj_jp2_encode( opj_jp2_v2_t *jp2, opj_bool opj_jp2_encode( opj_jp2_v2_t *jp2,
opj_stream_private_t *stream, opj_stream_private_t *stream,
opj_event_mgr_t * p_manager); opj_event_mgr_t * p_manager);
/** /**
* Starts a compression scheme, i.e. validates the codec parameters, writes the header. * Starts a compression scheme, i.e. validates the codec parameters, writes the header.
* *
* @param jp2 the jpeg2000 file codec. * @param jp2 the jpeg2000 file codec.
* @param stream the stream object. * @param stream the stream object.
* @param p_image FIXME DOC * @param p_image FIXME DOC
* @param p_manager FIXME DOC * @param p_manager FIXME DOC
* *
* @return true if the codec is valid. * @return true if the codec is valid.
@ -333,9 +337,9 @@ opj_bool opj_jp2_start_compress(opj_jp2_v2_t *jp2,
* Ends the compression procedures and possibiliy add data to be read after the * Ends the compression procedures and possibiliy add data to be read after the
* codestream. * codestream.
*/ */
opj_bool opj_jp2_end_compress( opj_jp2_v2_t *jp2, opj_bool opj_jp2_end_compress( opj_jp2_v2_t *jp2,
opj_stream_private_t *cio, opj_stream_private_t *cio,
opj_event_mgr_t * p_manager); opj_event_mgr_t * p_manager);
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
@ -357,24 +361,24 @@ opj_bool opj_jp2_end_decompress(opj_jp2_v2_t *jp2,
* *
* @return true if the box is valid. * @return true if the box is valid.
*/ */
opj_bool opj_jp2_read_header( opj_stream_private_t *p_stream, opj_bool opj_jp2_read_header( opj_stream_private_t *p_stream,
opj_jp2_v2_t *jp2, opj_jp2_v2_t *jp2,
opj_image_t ** p_image, opj_image_t ** p_image,
opj_event_mgr_t * p_manager ); opj_event_mgr_t * p_manager );
/** /**
* Reads a tile header. * Reads a tile header.
* @param p_jp2 the jpeg2000 codec. * @param p_jp2 the jpeg2000 codec.
* @param p_tile_index FIXME DOC * @param p_tile_index FIXME DOC
* @param p_data_size FIXME DOC * @param p_data_size FIXME DOC
* @param p_tile_x0 FIXME DOC * @param p_tile_x0 FIXME DOC
* @param p_tile_y0 FIXME DOC * @param p_tile_y0 FIXME DOC
* @param p_tile_x1 FIXME DOC * @param p_tile_x1 FIXME DOC
* @param p_tile_y1 FIXME DOC * @param p_tile_y1 FIXME DOC
* @param p_nb_comps FIXME DOC * @param p_nb_comps FIXME DOC
* @param p_go_on FIXME DOC * @param p_go_on FIXME DOC
* @param p_stream the stream to write data to. * @param p_stream the stream to write data to.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
opj_bool opj_jp2_read_tile_header ( opj_jp2_v2_t * p_jp2, opj_bool opj_jp2_read_tile_header ( opj_jp2_v2_t * p_jp2,
OPJ_UINT32 * p_tile_index, OPJ_UINT32 * p_tile_index,
@ -391,28 +395,28 @@ opj_bool opj_jp2_read_tile_header ( opj_jp2_v2_t * p_jp2,
/** /**
* Writes a tile. * Writes a tile.
* *
* @param p_jp2 the jpeg2000 codec. * @param p_jp2 the jpeg2000 codec.
* @param p_tile_index FIXME DOC * @param p_tile_index FIXME DOC
* @param p_data FIXME DOC * @param p_data FIXME DOC
* @param p_data_size FIXME DOC * @param p_data_size FIXME DOC
* @param p_stream the stream to write data to. * @param p_stream the stream to write data to.
* @param p_manager the user event manager. * @param p_manager the user event manager.
*/ */
opj_bool opj_jp2_write_tile ( opj_jp2_v2_t *p_jp2, opj_bool opj_jp2_write_tile ( opj_jp2_v2_t *p_jp2,
OPJ_UINT32 p_tile_index, OPJ_UINT32 p_tile_index,
OPJ_BYTE * p_data, OPJ_BYTE * p_data,
OPJ_UINT32 p_data_size, OPJ_UINT32 p_data_size,
opj_stream_private_t *p_stream, opj_stream_private_t *p_stream,
opj_event_mgr_t * p_manager ); opj_event_mgr_t * p_manager );
/** /**
* Decode tile data. * Decode tile data.
* @param p_jp2 the jpeg2000 codec. * @param p_jp2 the jpeg2000 codec.
* @param p_tile_index FIXME DOC * @param p_tile_index FIXME DOC
* @param p_data FIXME DOC * @param p_data FIXME DOC
* @param p_data_size FIXME DOC * @param p_data_size FIXME DOC
* @param p_stream the stream to write data to. * @param p_stream the stream to write data to.
* @param p_manager the user event manager. * @param p_manager the user event manager.
* *
* @return FIXME DOC * @return FIXME DOC
*/ */
@ -426,7 +430,7 @@ opj_bool opj_jp2_decode_tile ( opj_jp2_v2_t * p_jp2,
/** /**
* Creates a jpeg2000 file decompressor. * Creates a jpeg2000 file decompressor.
* *
* @return an empty jpeg2000 file codec. * @return an empty jpeg2000 file codec.
*/ */
opj_jp2_v2_t* opj_jp2_create (opj_bool p_is_decoder); opj_jp2_v2_t* opj_jp2_create (opj_bool p_is_decoder);
@ -440,26 +444,26 @@ void opj_jp2_destroy(opj_jp2_v2_t *jp2);
/** /**
* 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.
* *
* @param p_jp2 the jpeg2000 codec. * @param p_jp2 the jpeg2000 codec.
* @param p_image FIXME DOC * @param p_image FIXME DOC
* @param p_start_x the left position of the rectangle to decode (in image coordinates). * @param p_start_x the left 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_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_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).
* @param p_manager the user event manager * @param p_manager the user event manager
* *
* @return true if the area could be set. * @return true if the area could be set.
*/ */
opj_bool opj_jp2_set_decode_area( opj_jp2_v2_t *p_jp2, opj_bool opj_jp2_set_decode_area( opj_jp2_v2_t *p_jp2,
opj_image_t* p_image, opj_image_t* p_image,
OPJ_INT32 p_start_x, OPJ_INT32 p_start_y, OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
OPJ_INT32 p_end_x, OPJ_INT32 p_end_y, OPJ_INT32 p_end_x, OPJ_INT32 p_end_y,
opj_event_mgr_t * p_manager ); opj_event_mgr_t * p_manager );
/** /**
* *
*/ */
opj_bool opj_jp2_get_tile( opj_jp2_v2_t *p_jp2, opj_bool opj_jp2_get_tile( opj_jp2_v2_t *p_jp2,
opj_stream_private_t *p_stream, opj_stream_private_t *p_stream,
opj_image_t* p_image, opj_image_t* p_image,
opj_event_mgr_t * p_manager, opj_event_mgr_t * p_manager,
@ -478,9 +482,9 @@ opj_bool opj_jp2_set_decoded_resolution_factor(opj_jp2_v2_t *p_jp2,
/** /**
* Dump some elements from the JP2 decompression structure . * Dump some elements from the JP2 decompression structure .
* *
*@param p_jp2 the jp2 codec. *@param p_jp2 the jp2 codec.
*@param flag flag to describe what elments are dump. *@param flag flag to describe what elments are dump.
*@param out_stream output stream where dump the elements. *@param out_stream output stream where dump the elements.
* *
*/ */
void jp2_dump (opj_jp2_v2_t* p_jp2, OPJ_INT32 flag, FILE* out_stream); void jp2_dump (opj_jp2_v2_t* p_jp2, OPJ_INT32 flag, FILE* out_stream);
@ -488,18 +492,18 @@ void jp2_dump (opj_jp2_v2_t* p_jp2, OPJ_INT32 flag, FILE* out_stream);
/** /**
* Get the codestream info from a JPEG2000 codec. * Get the codestream info from a JPEG2000 codec.
* *
*@param p_jp2 jp2 codec. *@param p_jp2 jp2 codec.
* *
*@return the codestream information extract from the jpg2000 codec *@return the codestream information extract from the jpg2000 codec
*/ */
opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_v2_t* p_jp2); opj_codestream_info_v2_t* jp2_get_cstr_info(opj_jp2_v2_t* p_jp2);
/** /**
* Get the codestream index from a JPEG2000 codec. * Get the codestream index from a JPEG2000 codec.
* *
*@param p_jp2 jp2 codec. *@param p_jp2 jp2 codec.
* *
*@return the codestream index extract from the jpg2000 codec *@return the codestream index extract from the jpg2000 codec
*/ */
opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_v2_t* p_jp2); opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_v2_t* p_jp2);

1
src/lib/openjp2/openjpeg.c
View File

@ -769,7 +769,6 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
parameters->cp_disto_alloc = 0; parameters->cp_disto_alloc = 0;
parameters->cp_fixed_alloc = 0; parameters->cp_fixed_alloc = 0;
parameters->cp_fixed_quality = 0; parameters->cp_fixed_quality = 0;
parameters->jpip_on = OPJ_FALSE;
/* UniPG>> */ /* UniPG>> */
#ifdef USE_JPWL #ifdef USE_JPWL
parameters->jpwl_epc_on = OPJ_FALSE; parameters->jpwl_epc_on = OPJ_FALSE;

2
src/lib/openjp2/openjpeg.h
View File

@ -415,8 +415,6 @@ typedef struct opj_cparameters {
char tp_flag; char tp_flag;
/** MCT (multiple component transform) */ /** MCT (multiple component transform) */
char tcp_mct; char tcp_mct;
/** Enable JPIP indexing*/
opj_bool jpip_on;
/** Naive implementation of MCT restricted to a single reversible array based encoding without offset concerning all the components. */ /** Naive implementation of MCT restricted to a single reversible array based encoding without offset concerning all the components. */
void * mct_data; void * mct_data;

2
src/lib/openmj2/j2k.c
View File

@ -313,7 +313,7 @@ static int j2k_get_num_tp(opj_cp_t *cp,int pino,int tileno){
} }
/** mem allocation for TLM marker*/ /** mem allocation for TLM marker*/
int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k ){ static int j2k_calculate_tp(opj_cp_t *cp,int img_numcomp,opj_image_t *image,opj_j2k_t *j2k ){
int pino,tileno,totnum_tp=0; int pino,tileno,totnum_tp=0;
OPJ_ARG_NOT_USED(img_numcomp); OPJ_ARG_NOT_USED(img_numcomp);

29
src/lib/openmj2/jp2.c
View File

@ -1100,8 +1100,6 @@ void jp2_setup_encoder(opj_jp2_t *jp2, opj_cparameters_t *parameters, opj_image_
jp2->enumcs = 18; /* YUV */ jp2->enumcs = 18; /* YUV */
jp2->precedence = 0; /* PRECEDENCE */ jp2->precedence = 0; /* PRECEDENCE */
jp2->approx = 0; /* APPROX */ jp2->approx = 0; /* APPROX */
jp2->jpip_on = parameters->jpip_on;
} }
opj_bool opj_jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) { opj_bool opj_jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_codestream_info_t *cstr_info) {
@ -1118,38 +1116,11 @@ opj_bool opj_jp2_encode(opj_jp2_t *jp2, opj_cio_t *cio, opj_image_t *image, opj_
/* JP2 Header box */ /* JP2 Header box */
jp2_write_jp2h(jp2, cio); jp2_write_jp2h(jp2, cio);
#if 0
if( jp2->jpip_on){
pos_iptr = cio_tell( cio);
cio_skip( cio, 24); /* IPTR further ! */
pos_jp2c = cio_tell( cio);
}
#endif
/* J2K encoding */ /* J2K encoding */
if(!(len_jp2c = jp2_write_jp2c( jp2, cio, image, cstr_info))){ if(!(len_jp2c = jp2_write_jp2c( jp2, cio, image, cstr_info))){
opj_event_msg(jp2->cinfo, EVT_ERROR, "Failed to encode image\n"); opj_event_msg(jp2->cinfo, EVT_ERROR, "Failed to encode image\n");
return OPJ_FALSE; return OPJ_FALSE;
} }
#if 0
if( jp2->jpip_on){
pos_cidx = cio_tell( cio);
len_cidx = write_cidx( pos_jp2c+8, cio, image, *cstr_info, len_jp2c-8);
pos_fidx = cio_tell( cio);
len_fidx = write_fidx( pos_jp2c, len_jp2c, pos_cidx, len_cidx, cio);
end_pos = cio_tell( cio);
cio_seek( cio, pos_iptr);
write_iptr( pos_fidx, len_fidx, cio);
cio_seek( cio, end_pos);
}
#endif
return OPJ_TRUE; return OPJ_TRUE;
} }

3
src/lib/openmj2/jp2.h
View File

@ -37,8 +37,6 @@
/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */ /** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
/*@{*/ /*@{*/
#define JPIP_JPIP 0x6a706970
#define JP2_JP 0x6a502020 /**< JPEG 2000 signature box */ #define JP2_JP 0x6a502020 /**< JPEG 2000 signature box */
#define JP2_FTYP 0x66747970 /**< File type box */ #define JP2_FTYP 0x66747970 /**< File type box */
#define JP2_JP2H 0x6a703268 /**< JP2 header box */ #define JP2_JP2H 0x6a703268 /**< JP2 header box */
@ -140,7 +138,6 @@ typedef struct opj_jp2 {
opj_jp2_comps_t *comps; opj_jp2_comps_t *comps;
unsigned int j2k_codestream_offset; unsigned int j2k_codestream_offset;
unsigned int j2k_codestream_length; unsigned int j2k_codestream_length;
opj_bool jpip_on;
opj_bool ignore_pclr_cmap_cdef; opj_bool ignore_pclr_cmap_cdef;
} opj_jp2_t; } opj_jp2_t;

1
src/lib/openmj2/openjpeg.c
View File

@ -249,7 +249,6 @@ void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *paramete
parameters->cp_disto_alloc = 0; parameters->cp_disto_alloc = 0;
parameters->cp_fixed_alloc = 0; parameters->cp_fixed_alloc = 0;
parameters->cp_fixed_quality = 0; parameters->cp_fixed_quality = 0;
parameters->jpip_on = OPJ_FALSE;
/* UniPG>> */ /* UniPG>> */
#ifdef USE_JPWL #ifdef USE_JPWL
parameters->jpwl_epc_on = OPJ_FALSE; parameters->jpwl_epc_on = OPJ_FALSE;

2
src/lib/openmj2/openjpeg.h
View File

@ -351,8 +351,6 @@ typedef struct opj_cparameters {
char tp_flag; char tp_flag;
/** MCT (multiple component transform) */ /** MCT (multiple component transform) */
char tcp_mct; char tcp_mct;
/** Enable JPIP indexing*/
opj_bool jpip_on;
} opj_cparameters_t; } opj_cparameters_t;
#define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG 0x0001 #define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG 0x0001

6
wrapping/java/openjp2/JavaOpenJPEG.c
View File

@ -512,7 +512,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
/* parse the command line */ /* parse the command line */
/* UniPG>> */ /* UniPG>> */
const char optlist[] = "i:o:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J" const char optlist[] = "i:o:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:"
#ifdef USE_JPWL #ifdef USE_JPWL
"W:" "W:"
#endif /* USE_JPWL */ #endif /* USE_JPWL */
@ -1246,10 +1246,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
/* <<UniPG */ /* <<UniPG */
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */
case 'J': /* jpip on */
{
parameters->jpip_on = OPJ_TRUE;
}
break; break;
/* ------------------------------------------------------ */ /* ------------------------------------------------------ */