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

[trunk] WIP: add basis for a new output management of the codestream information and index

This commit is contained in:
Mickael Savinaud 2011-09-27 12:14:11 +00:00
parent de7793e918
commit a600d8f4e2
15 changed files with 999 additions and 731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -6,6 +6,7 @@ What's New for OpenJPEG
+ : added
September 27, 2011
+ (mickael] WIP: add basis for a new output management of the codestream information and index
* [mickael] WIP: fix some warnings from j2k_dump and index.c
September 22, 2011

105
applications/codec/index.c
View File

@ -392,109 +392,4 @@ int write_index_file(opj_codestream_info_t *cstr_info, char *index) {
return 0;
}
/* ------------------------------------------------------------------------------------ */
/**
Dump the file info structure into a file
@param stream output stream
@param file_info informations read into the JPG2000 file
@return Returns 0 if successful, returns 1 otherwise
*/
int dump_file_info(FILE* stream, opj_file_info_t *file_info)
{
/* IMAGE HEADER */
if ( file_info->file_info_flag & OPJ_IMG_INFO ) {
opj_image_header_t img_header = file_info->img_info;
int compno;
fprintf(stream, "Image info {\n");
fprintf(stream, "\t x0=%d, y0=%d\n",img_header.x0, img_header.y0);
fprintf(stream, "\t x1=%d, y1=%d\n",img_header.x1, img_header.y1);
fprintf(stream, "\t numcomps=%d\n", img_header.numcomps);
for (compno = 0; compno < img_header.numcomps; compno++) {
opj_image_comp_header_t comp = img_header.comps[compno];
fprintf(stream, "\t component %d {\n", compno);
fprintf(stream, "\t\t dx=%d, dy=%d\n", comp.dx, comp.dy);
fprintf(stream, "\t\t prec=%d\n", comp.prec);
fprintf(stream, "\t\t sgnd=%d\n", comp.sgnd);
fprintf(stream, "\t}\n");
}
fprintf(stream, "}\n");
}
/* CODESTREAM INFO */
if ( file_info->file_info_flag & OPJ_J2K_INFO ) {
opj_codestream_info_v2_t cstr_info = file_info->codestream_info;
int tileno, compno, layno, bandno, resno, numbands;
fprintf(stream, "Codestream info {\n");
fprintf(stream, "\t tx0=%d, ty0=%d\n", cstr_info.tx0, cstr_info.ty0);
fprintf(stream, "\t tdx=%d, tdy=%d\n", cstr_info.tdx, cstr_info.tdy);
fprintf(stream, "\t tw=%d, th=%d\n", cstr_info.tw, cstr_info.th);
for (tileno = 0; tileno < cstr_info.tw * cstr_info.th; tileno++) {
opj_tile_info_v2_t tile_info = cstr_info.tile[tileno];
fprintf(stream, "\t tile %d {\n", tileno);
fprintf(stream, "\t\t csty=%x\n", tile_info.csty);
fprintf(stream, "\t\t prg=%d\n", tile_info.prg);
fprintf(stream, "\t\t numlayers=%d\n", tile_info.numlayers);
fprintf(stream, "\t\t mct=%d\n", tile_info.mct);
fprintf(stream, "\t\t rates=");
for (layno = 0; layno < tile_info.numlayers; layno++) {
fprintf(stream, "%.1f ", tile_info.rates[layno]);
}
fprintf(stream, "\n");
for (compno = 0; compno < cstr_info.numcomps; compno++) {
opj_tccp_info_t tccp_info = tile_info.tccp_info[compno];
fprintf(stream, "\t\t comp %d {\n", compno);
fprintf(stream, "\t\t\t csty=%x\n", tccp_info.csty);
fprintf(stream, "\t\t\t numresolutions=%d\n", tccp_info.numresolutions);
fprintf(stream, "\t\t\t cblkw=%d\n", tccp_info.cblkw);
fprintf(stream, "\t\t\t cblkh=%d\n", tccp_info.cblkh);
fprintf(stream, "\t\t\t cblksty=%x\n", tccp_info.cblksty);
fprintf(stream, "\t\t\t qmfbid=%d\n", tccp_info.qmfbid);
fprintf(stream, "\t\t\t qntsty=%d\n", tccp_info.qntsty);
fprintf(stream, "\t\t\t numgbits=%d\n", tccp_info.numgbits);
fprintf(stream, "\t\t\t roishift=%d\n", tccp_info.roishift);
#ifdef TODO_MSD
fprintf(stream, "\t\t\t stepsizes=");
numbands = tccp_info->qntsty == J2K_CCP_QNTSTY_SIQNT ? 1 : tccp_info->numresolutions * 3 - 2;
for (bandno = 0; bandno < numbands; bandno++) {
fprintf(stream, "(%d,%d) ", tccp_info->stepsizes[bandno].mant,
tccp_info->stepsizes[bandno].expn);
}
fprintf(stream, "\n");
if (tccp_info->csty & J2K_CCP_CSTY_PRT) {
fprintf(stream, " prcw=");
for (resno = 0; resno < tccp_info->numresolutions; resno++) {
fprintf(stream, "%d ", tccp_info->prcw[resno]);
}
fprintf(stream, "\n");
fprintf(stream, " prch=");
for (resno = 0; resno < tccp_info->numresolutions; resno++) {
fprintf(stream, "%d ", tccp_info->prch[resno]);
}
fprintf(stream, "\n");
}
#endif
fprintf(stream, "\t\t\t }\n");
} /*end of component*/
fprintf(stream, "\t\t }\n");
} /*end of tile */
fprintf(stream, "\t }\n");
}
if ( file_info->file_info_flag & OPJ_JP2_INFO ) {
// not yet coded
}
return EXIT_SUCCESS;
}

2
applications/codec/index.h
View File

@ -41,8 +41,6 @@ Write a structured index to a file
*/
int write_index_file(opj_codestream_info_t *cstr_info, char *index);
int dump_file_info(FILE* stream, opj_file_info_t *file_info);
#ifdef __cplusplus
}
#endif

102
applications/codec/j2k_dump.c
View File

@ -76,10 +76,6 @@ typedef struct img_folder{
/* -------------------------------------------------------------------------- */
/* Declarations */
static void j2k_dump_image(FILE *fd, opj_image_header_t * img);
static void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_v2_t * cp);
int get_num_images(char *imgdirpath);
int load_images(dircnt_t *dirptr, char *imgdirpath);
int get_file_format(char *filename);
@ -378,9 +374,11 @@ int main(int argc, char *argv[])
opj_dparameters_t parameters; /* Decompression parameters */
opj_event_mgr_t event_mgr; /* Event manager */
opj_file_info_t file_info; /* File info structure */
opj_image_header_t img_header; /* Image info structure */
opj_codec_t* dinfo = NULL; /* Handle to a decompressor */
opj_stream_t *cio = NULL; /* Stream */
opj_codestream_info_v2_t* cstr_info;
opj_codestream_index_t* cstr_index;
OPJ_INT32 num_images, imageno;
img_fol_t img_fol;
@ -510,7 +508,7 @@ int main(int argc, char *argv[])
}
/* Read the main header of the codestream and if necessary the JP2 boxes*/
if(! opj_read_header(cio, dinfo, &file_info, OPJ_IMG_INFO | OPJ_J2K_INFO)){
if(! opj_read_header(cio, dinfo, &img_header)){
fprintf(stderr, "ERROR -> j2k_dump: failed to read the header\n");
opj_stream_destroy(cio);
fclose(fsrc);
@ -519,9 +517,16 @@ int main(int argc, char *argv[])
return EXIT_FAILURE;
}
opj_dump_codec(dinfo, OPJ_IMG_INFO | OPJ_J2K_MH_INFO | OPJ_J2K_MH_IND, stdout );
cstr_info = opj_get_cstr_info(dinfo);
cstr_index = opj_get_cstr_index(dinfo);
fprintf(stdout,"Setting decoding area to %d,%d,%d,%d\n",
parameters.DA_x0, parameters.DA_y0, parameters.DA_x1, parameters.DA_y1);
#ifdef MSD
/* FIXME WIP_MSD <*/
if (! opj_set_decode_area( dinfo,
parameters.DA_x0, parameters.DA_y0,
@ -586,9 +591,7 @@ int main(int argc, char *argv[])
}
}
/* FIXME WIP_MSD >*/
/* Dump file informations from header */
dump_file_info(fout, &file_info);
#endif
/* close the byte stream */
opj_stream_destroy(cio);
@ -599,6 +602,9 @@ int main(int argc, char *argv[])
opj_destroy_codec(dinfo);
}
/* destroy the image header */
opj_image_header_destroy(&img_header);
}
/* Close the output file */
@ -606,81 +612,3 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
}
static void j2k_dump_image(FILE *fd, opj_image_header_t * img) {
int compno;
fprintf(fd, "image {\n");
fprintf(fd, " x0=%d, y0=%d, x1=%d, y1=%d\n", img->x0, img->y0, img->x1, img->y1);
fprintf(fd, " numcomps=%d\n", img->numcomps);
for (compno = 0; compno < img->numcomps; compno++) {
opj_image_comp_header_t *comp = &img->comps[compno];
fprintf(fd, " comp %d {\n", compno);
fprintf(fd, " dx=%d, dy=%d\n", comp->dx, comp->dy);
fprintf(fd, " prec=%d\n", comp->prec);
/* fprintf(fd, " bpp=%d\n", comp->bpp); */
fprintf(fd, " sgnd=%d\n", comp->sgnd);
fprintf(fd, " }\n");
}
//fprintf(fd, " XTOsiz=%d, YTOsiz=%d, XTsiz=%d, YTsiz=%d\n", img->tile_x0, img->tile_y0, img->tile_width, img->tile_height);
//fprintf(fd, " Nb of tiles in x direction=%d, Nb of tiles in y direction=%d\n", img->nb_tiles_x, img->nb_tiles_y);
fprintf(fd, "}\n");
}
static void j2k_dump_cp(FILE *fd, opj_image_t * img, opj_cp_v2_t * cp) {
int tileno, compno, layno, bandno, resno, numbands;
fprintf(fd, "coding parameters {\n");
fprintf(fd, " tx0=%d, ty0=%d\n", cp->tx0, cp->ty0);
fprintf(fd, " tdx=%d, tdy=%d\n", cp->tdx, cp->tdy);
fprintf(fd, " tw=%d, th=%d\n", cp->tw, cp->th);
for (tileno = 0; tileno < cp->tw * cp->th; tileno++) {
opj_tcp_v2_t *tcp = &cp->tcps[tileno];
fprintf(fd, " tile %d {\n", tileno);
fprintf(fd, " csty=%x\n", tcp->csty);
fprintf(fd, " prg=%d\n", tcp->prg);
fprintf(fd, " numlayers=%d\n", tcp->numlayers);
fprintf(fd, " mct=%d\n", tcp->mct);
fprintf(fd, " rates=");
for (layno = 0; layno < tcp->numlayers; layno++) {
fprintf(fd, "%.1f ", tcp->rates[layno]);
}
fprintf(fd, "\n");
for (compno = 0; compno < img->numcomps; compno++) {
opj_tccp_t *tccp = &tcp->tccps[compno];
fprintf(fd, " comp %d {\n", compno);
fprintf(fd, " csty=%x\n", tccp->csty);
fprintf(fd, " numresolutions=%d\n", tccp->numresolutions);
fprintf(fd, " cblkw=%d\n", tccp->cblkw);
fprintf(fd, " cblkh=%d\n", tccp->cblkh);
fprintf(fd, " cblksty=%x\n", tccp->cblksty);
fprintf(fd, " qmfbid=%d\n", tccp->qmfbid);
fprintf(fd, " qntsty=%d\n", tccp->qntsty);
fprintf(fd, " numgbits=%d\n", tccp->numgbits);
fprintf(fd, " roishift=%d\n", tccp->roishift);
fprintf(fd, " stepsizes=");
numbands = tccp->qntsty == J2K_CCP_QNTSTY_SIQNT ? 1 : tccp->numresolutions * 3 - 2;
for (bandno = 0; bandno < numbands; bandno++) {
fprintf(fd, "(%d,%d) ", tccp->stepsizes[bandno].mant,
tccp->stepsizes[bandno].expn);
}
fprintf(fd, "\n");
if (tccp->csty & J2K_CCP_CSTY_PRT) {
fprintf(fd, " prcw=");
for (resno = 0; resno < tccp->numresolutions; resno++) {
fprintf(fd, "%d ", tccp->prcw[resno]);
}
fprintf(fd, "\n");
fprintf(fd, " prch=");
for (resno = 0; resno < tccp->numresolutions; resno++) {
fprintf(fd, "%d ", tccp->prch[resno]);
}
fprintf(fd, "\n");
}
fprintf(fd, " }\n");
} /*end of component*/
fprintf(fd, " }\n");
} /*end of tile */
fprintf(fd, "}\n");
}

6
libopenjpeg/image.c
View File

@ -140,9 +140,3 @@ void opj_image_comp_header_update(opj_image_header_t * p_image_header, const opj
++l_img_comp;
}
}
void opj_initialise_file_info(opj_file_info_t *file_info, OPJ_INT32 file_info_flag, OPJ_INT32 codec_format) {
file_info->file_info_flag = file_info_flag;
file_info->file_format = codec_format;
}

926
libopenjpeg/j2k.c
View File

File diff suppressed because it is too large Load Diff

74
libopenjpeg/j2k.h
View File

@ -80,7 +80,7 @@ The functions in J2K.C have for goal to read/write the several parts of the code
#define J2K_MS_UNK 0 /**< UNKNOWN marker value */
#ifdef TODO_MS
#ifdef TODO_MS /* FIXME */
#define J2K_MS_CBD 0xff78 /**< CBD marker value */
#define J2K_MS_MCC 0xff75 /**< MCC marker value */
#define J2K_MS_MCT 0xff74 /**< MCT marker value */
@ -745,6 +745,10 @@ JPEG-2000 codestream reader/writer
*/
typedef struct opj_j2k_v2
{
/* J2K codestream is decoded*/
opj_bool m_is_decoder;
/* FIXME DOC*/
union
{
opj_j2k_dec_t m_decoder;
@ -769,13 +773,13 @@ typedef struct opj_j2k_v2
struct opj_procedure_list * m_validation_list;
/** helper used to write the index file */
opj_codestream_info_v2_t *cstr_info;
opj_codestream_index_t *cstr_index;
/** the current tile coder/decoder **/
struct opj_tcd_v2 * m_tcd;
//opj_tcd_v2_t * m_tcd;
OPJ_UINT32 m_is_decoder : 1;
}
opj_j2k_v2_t;
@ -886,7 +890,7 @@ opj_bool j2k_end_decompress(opj_j2k_v2_t *j2k, struct opj_stream_private *cio, s
*/
opj_bool j2k_read_header( struct opj_stream_private *p_stream,
opj_j2k_v2_t* p_j2k,
opj_file_info_t * p_file_info,
opj_image_header_t* p_img_header,
struct opj_event_mgr* p_manager );
@ -945,14 +949,10 @@ opj_bool j2k_read_tile_header (
*
* @return true if the area could be set.
*/
opj_bool j2k_set_decode_area(
opj_j2k_v2_t *p_j2k,
OPJ_INT32 p_start_x,
OPJ_INT32 p_start_y,
OPJ_INT32 p_end_x,
OPJ_INT32 p_end_y,
struct opj_event_mgr * p_manager
);
opj_bool j2k_set_decode_area( opj_j2k_v2_t *p_j2k,
OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
OPJ_INT32 p_end_x, OPJ_INT32 p_end_y,
struct opj_event_mgr * p_manager );
/**
* Creates a J2K decompression structure.
@ -962,4 +962,54 @@ opj_bool j2k_set_decode_area(
opj_j2k_v2_t* j2k_create_decompress_v2();
/**
* Dump some elements from the J2K decompression structure .
*
*@param p_j2k the jpeg2000 codec.
*@param flag flag to describe what elments are dump.
*@param out_stream output stream where dump the elements.
*
*/
void j2k_dump (opj_j2k_v2_t* p_j2k, OPJ_INT32 flag, FILE* out_stream);
/**
* Dump an image header structure.
*
*@param img_header the image header to dump.
*@param dev_dump_flag flag to describe if we are in the case of this function is use outside j2k_dump function
*@param out_stream output stream where dump the elements.
*/
void j2k_dump_image_header(opj_image_header_t* img_header, opj_bool dev_dump_flag, FILE* out_stream);
/**
* Dump a component image header structure.
*
*@param comp_header the component image header to dump.
*@param dev_dump_flag flag to describe if we are in the case of this function is use outside j2k_dump function
*@param out_stream output stream where dump the elements.
*/
void j2k_dump_image_comp_header(opj_image_comp_header_t* comp_header, opj_bool dev_dump_flag, FILE* out_stream);
/**
* Get the codestream info from a JPEG2000 codec.
*
*@param p_j2k the component image header to dump.
*
*@return the codestream information extract from the jpg2000 codec
*/
opj_codestream_info_v2_t* j2k_get_cstr_info(opj_j2k_v2_t* p_j2k);
/**
* Get the codestream index from a JPEG2000 codec.
*
*@param p_j2k the component image header to dump.
*
*@return the codestream index extract from the jpg2000 codec
*/
opj_codestream_index_t* j2k_get_cstr_index(opj_j2k_v2_t* p_j2k);
#endif /* __J2K_H */

4
libopenjpeg/jp2.c
View File

@ -2390,7 +2390,7 @@ static opj_bool jp2_read_boxhdr_char(
*/
opj_bool jp2_read_header( struct opj_stream_private *p_stream,
opj_jp2_v2_t *jp2,
opj_file_info_t * p_file_info,
opj_image_header_t* p_img_header,
struct opj_event_mgr * p_manager
)
{
@ -2417,7 +2417,7 @@ opj_bool jp2_read_header( struct opj_stream_private *p_stream,
return j2k_read_header( p_stream,
jp2->j2k,
p_file_info,
p_img_header,
p_manager);
}

8
libopenjpeg/jp2.h
View File

@ -145,7 +145,7 @@ JP2 component
typedef struct opj_jp2_comps {
int depth;
int sgnd;
int bpcc;
OPJ_UINT32 bpcc;
} opj_jp2_comps_t;
/**
@ -221,8 +221,8 @@ opj_jp2_v2_t;
JP2 Box
*/
typedef struct opj_jp2_box {
OPJ_INT32 length;
OPJ_INT32 type;
OPJ_UINT32 length;
OPJ_UINT32 type;
OPJ_INT32 init_pos;
} opj_jp2_box_t;
@ -334,7 +334,7 @@ opj_bool jp2_end_decompress(opj_jp2_v2_t *jp2, struct opj_stream_private *cio, s
*/
opj_bool jp2_read_header( struct opj_stream_private *p_stream,
opj_jp2_v2_t *jp2,
opj_file_info_t * p_file_info,
opj_image_header_t * p_img_header,
struct opj_event_mgr * p_manager
);

92
libopenjpeg/openjpeg.c
View File

@ -40,7 +40,7 @@ typedef struct opj_decompression
/** Main header reading function handler*/
opj_bool (* opj_read_header) ( struct opj_stream_private * cio,
void * p_codec,
opj_file_info_t * file_info,
opj_image_header_t *p_img_header,
struct opj_event_mgr * p_manager);
/** FIXME DOC */
opj_image_t* (* opj_decode) ( void * p_codec,
@ -108,6 +108,9 @@ typedef struct opj_codec_private
opj_event_mgr_t* m_event_mgr;
/** Flag to indicate if the codec is used to decode or encode*/
opj_bool is_decompressor;
opj_bool (*opj_dump_codec) (void * p_codec, OPJ_INT32 info_flag, FILE* output_stream);
opj_codestream_info_v2_t* (*opj_get_codec_info)(void* p_codec);
opj_codestream_index_t* (*opj_get_codec_index)(void* p_codec);
}
opj_codec_private_t;
@ -225,6 +228,12 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT p_format)
switch (p_format) {
case CODEC_J2K:
l_info->opj_dump_codec = (opj_bool (*) (void*, OPJ_INT32, FILE*)) j2k_dump;
l_info->opj_get_codec_info = (opj_codestream_info_v2_t* (*) (void*) ) j2k_get_cstr_info;
l_info->opj_get_codec_index = (opj_codestream_index_t* (*) (void*) ) j2k_get_cstr_index;
l_info->m_codec_data.m_decompression.opj_decode =
(opj_image_t* (*) (void *, struct opj_stream_private *, struct opj_event_mgr * ))j2k_decode; // TODO MSD
@ -234,7 +243,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT p_format)
l_info->m_codec_data.m_decompression.opj_read_header =
(opj_bool (*) ( struct opj_stream_private *,
void *,
opj_file_info_t *,
opj_image_header_t *,
struct opj_event_mgr * )) j2k_read_header;
l_info->m_codec_data.m_decompression.opj_destroy = (void (*) (void *))j2k_destroy;
@ -276,7 +285,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT p_format)
l_info->m_codec_data.m_decompression.opj_read_header = (opj_bool (*) (
struct opj_stream_private *,
void *,
opj_file_info_t *,
opj_image_header_t *,
struct opj_event_mgr * )) jp2_read_header;
l_info->m_codec_data.m_decompression.opj_read_tile_header = ( opj_bool (*) (
@ -625,6 +634,27 @@ void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info) {
}
}
void OPJ_CALLCONV opj_destroy_cstr_info_v2(opj_codestream_info_v2_t *cstr_info) {
if (cstr_info) {
int tileno, compno;
if (cstr_info->tile_info){
for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
for (compno = 0; compno < cstr_info->nbcomps; compno++){
opj_free(cstr_info->tile_info[tileno].tccp_info);
}
}
opj_free(cstr_info->tile_info);
}
if (cstr_info->m_default_tile_info.tccp_info){
opj_free(cstr_info->m_default_tile_info.tccp_info);
}
opj_free(cstr_info);
}
}
#ifdef OLD_WAY_MS
@ -665,13 +695,8 @@ opj_bool OPJ_CALLCONV opj_read_header (
opj_bool OPJ_CALLCONV opj_read_header ( opj_stream_t *p_cio,
opj_codec_t *p_codec,
opj_file_info_t* p_file_info,
OPJ_INT32 file_info_flag)
opj_image_header_t *p_img_header )
{
/* Initialize the output structure */
opj_initialise_file_info(p_file_info, file_info_flag, CODEC_J2K);
if (p_codec && p_cio) {
opj_codec_private_t* l_info = (opj_codec_private_t*) p_codec;
opj_stream_private_t* l_cio = (opj_stream_private_t*) p_cio;
@ -684,7 +709,7 @@ opj_bool OPJ_CALLCONV opj_read_header ( opj_stream_t *p_cio,
return l_info->m_codec_data.m_decompression.opj_read_header(
l_cio,
l_info->m_codec,
p_file_info,
p_img_header,
l_info->m_event_mgr);
}
@ -834,3 +859,50 @@ opj_bool OPJ_CALLCONV opj_decode_tile_data(
}
return OPJ_FALSE;
}
/*
*
*
*/
void OPJ_CALLCONV opj_dump_codec( opj_codec_t *p_codec,
OPJ_INT32 info_flag,
FILE* output_stream)
{
if (p_codec) {
opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
l_codec->opj_dump_codec(l_codec->m_codec, info_flag, output_stream);
}
fprintf(stderr, "[ERROR] Input parameter of the dump_codec function are incorrect.\n");
}
/*
*
*
*/
opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(opj_codec_t *p_codec)
{
if (p_codec) {
opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
return l_codec->opj_get_codec_info(l_codec->m_codec);
}
return NULL;
}
/*
*
*
*/
opj_codestream_index_t * OPJ_CALLCONV opj_get_cstr_index(opj_codec_t *p_codec)
{
if (p_codec) {
opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
return l_codec->opj_get_codec_index(l_codec->m_codec);
}
return NULL;
}

353
libopenjpeg/openjpeg.h
View File

@ -7,6 +7,7 @@
* Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2006-2007, Parvatha Elangovan
* Copyright (c) 2010-2011, Kaori Hagihara
* Copyright (c) 2011, Mickael Savinaud, Communications & Systemes <mickael.savinaud@c-s.fr>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -60,7 +61,7 @@ defined with this macro as being exported.
#endif /* OPJ_EXPORTS */
#endif /* !OPJ_STATIC || !_WIN32 */
typedef int opj_bool;
typedef int opj_bool; /*FIXME -> OPJ_BOOL*/
#define OPJ_TRUE 1
#define OPJ_FALSE 0
@ -108,10 +109,15 @@ typedef float OPJ_FLOAT32;
/**
Supported options about file information
*/
#define OPJ_NO_INFO 0x0 /**< No information provied to the user */
#define OPJ_IMG_INFO 0x1 /**< Basic image information provided to the user */
#define OPJ_J2K_INFO 0x2 /**< J2K codestream information provided to the user */
#define OPJ_JP2_INFO 0x4 /**< JP2 file information provided to the user */
#define OPJ_IMG_INFO 1 /**< Basic image information provided to the user */
#define OPJ_J2K_MH_INFO 2 /**< Codestream information based only on the main header */
#define OPJ_J2K_TH_INFO 4 /**< Tile information based on the current tile header */
/*FIXME #define OPJ_J2K_CSTR_INFO 6*/ /**< */
#define OPJ_J2K_MH_IND 16 /**< Codestream index based only on the main header */
#define OPJ_J2K_TH_IND 32 /**< Tile index based on the current tile */
/*FIXME #define OPJ_J2K_CSTR_IND 48*/ /**< */
#define OPJ_JP2_INFO 128 /**< JP2 file information */
#define OPJ_JP2_IND 256 /**< JP2 file index */
/*
@ -228,9 +234,9 @@ Progression order changes
*/
typedef struct opj_poc {
/** Resolution num start, Component num start, given by POC */
int resno0, compno0;
OPJ_UINT32 resno0, compno0;
/** Layer num end,Resolution num end, Component num end, given by POC */
int layno1, resno1, compno1;
OPJ_UINT32 layno1, resno1, compno1;
/** Layer num start,Precinct num start, Precinct num end */
int layno0, precno0, precno1;
/** Progression order enum*/
@ -402,7 +408,7 @@ typedef struct opj_dparameters {
*/
int cp_layer;
/**@name command line encoder parameters (not used inside the library) */
/**@name command line decoder parameters (not used inside the library) */
/*@{*/
/** input file name */
char infile[OPJ_PATH_LEN];
@ -412,6 +418,18 @@ typedef struct opj_dparameters {
int decod_format;
/** output file format 0: PGX, 1: PxM, 2: BMP */
int cod_format;
/** Decoding area left boundary */
OPJ_UINT32 DA_x0;
/** Decoding area right boundary */
OPJ_UINT32 DA_x1;
/** Decoding area up boundary */
OPJ_UINT32 DA_y0;
/** Decoding area bottom boundary */
OPJ_UINT32 DA_y1;
/** Verbose mode */
opj_bool m_verbose;
/*@}*/
/* UniPG>> */
@ -434,19 +452,6 @@ typedef struct opj_dparameters {
*/
OPJ_LIMIT_DECODING cp_limit_decoding;
/** Decoding area left boundary */
OPJ_UINT32 DA_x0;
/** Decoding area right boundary */
OPJ_UINT32 DA_x1;
/** Decoding area up boundary */
OPJ_UINT32 DA_y0;
/** Decoding area bottom boundary */
OPJ_UINT32 DA_y1;
/** Verbose mode */
opj_bool m_verbose;
} opj_dparameters_t;
/** Common fields between JPEG-2000 compression and decompression master structs. */
@ -493,7 +498,7 @@ typedef struct opj_dinfo {
} opj_dinfo_t;
/**
* J2k codec.
* JPEG2000 codec.
*/
typedef void * opj_codec_t;
@ -533,12 +538,18 @@ typedef struct opj_cio {
unsigned char *bp;
} opj_cio_t;
/*
* FIXME DOC
*/
typedef OPJ_UINT32 (* opj_stream_read_fn) (void * p_buffer, OPJ_UINT32 p_nb_bytes, void * p_user_data) ;
typedef OPJ_UINT32 (* opj_stream_write_fn) (void * p_buffer, OPJ_UINT32 p_nb_bytes, void * p_user_data) ;
typedef OPJ_SIZE_T (* opj_stream_skip_fn) (OPJ_SIZE_T p_nb_bytes, void * p_user_data) ;
typedef opj_bool (* opj_stream_seek_fn) (OPJ_SIZE_T p_nb_bytes, void * p_user_data) ;
/*
* JPEG2000 Stream.
*/
typedef void * opj_stream_t;
/*
@ -675,21 +686,6 @@ typedef struct opj_image_header {
/** image components */
opj_image_comp_header_t *comps;
#ifdef TODO_MSD
/** XTOsiz */
OPJ_UINT32 tile_x0;
/** YTOsiz */
OPJ_UINT32 tile_y0;
/** XTsiz */
OPJ_UINT32 tile_width;
/** YTsiz */
OPJ_UINT32 tile_height;
/** number of tiles in width */
OPJ_UINT32 nb_tiles_x;
/** number of tiles in height */
OPJ_UINT32 nb_tiles_y;
#endif
/** 'restricted' ICC profile */
unsigned char *icc_profile_buf;
/** size of ICC profile */
@ -840,10 +836,11 @@ typedef struct opj_codestream_info {
opj_tile_info_t *tile;
} opj_codestream_info_t;
// NEW codestream
/* <----------------------------------------------------------- */
/* new output managment of the codestream information and index */
/**
Tile-component coding parameters
* Tile-component coding parameters information
*/
typedef struct opj_tccp_info
{
@ -864,7 +861,9 @@ typedef struct opj_tccp_info
/** quantisation style */
OPJ_UINT32 qntsty;
/** stepsizes used for quantization */
//FIXME opj_stepsize_t stepsizes[J2K_MAXBANDS];
OPJ_UINT32 stepsizes_mant[J2K_MAXBANDS];
/** stepsizes used for quantization */
OPJ_UINT32 stepsizes_expn[J2K_MAXBANDS];
/** number of guard bits */
OPJ_UINT32 numgbits;
/** Region Of Interest shift */
@ -876,23 +875,13 @@ typedef struct opj_tccp_info
}
opj_tccp_info_t;
/**
* Tile coding parameters information
*/
typedef struct opj_tile_v2_info {
/** number (index) of tile */
int tileno;
/** start position */
int start_pos;
/** end position of the header */
int end_header;
/** end position */
int end_pos;
/** add fixed_quality */
int numpix;
/** add fixed_quality */
double distotile;
/** coding style */
OPJ_UINT32 csty;
/** progression order */
@ -901,75 +890,75 @@ typedef struct opj_tile_v2_info {
OPJ_UINT32 numlayers;
/** multi-component transform identifier */
OPJ_UINT32 mct;
/** rates of layers */
OPJ_FLOAT32 rates[100];
/** precinct number for each resolution level (width) */
int pw[33];
/** precinct number for each resolution level (height) */
int ph[33];
/** precinct size (in power of 2), in X for each resolution level */
int pdx[33];
/** precinct size (in power of 2), in Y for each resolution level */
int pdy[33];
/** information concerning packets inside tile */
opj_packet_info_t *packet;
/** number of tile parts */
int num_tps;
/** information concerning tile parts */
opj_tp_info_t *tp;
/** information concerning tile component parameters*/
opj_tccp_info_t *tccp_info;
/** value of thresh for each layer by tile cfr. Marcela */
double *thresh;
} opj_tile_info_v2_t;
/**
Index structure of the codestream
* Information structure about the codestream (FIXME should be expand and enhance)
*/
typedef struct opj_codestream_info_v2 {
/* Basic image info */
/** image width */
int image_w;
/** image height */
int image_h;
/** numbers of component */
int numcomps;
/* Codestream Info */
/** progression order */
OPJ_PROG_ORDER prog;
/** number of layer */
int numlayers;
/** tile origin in x */
int tx0;
/** tile origin in y */
int ty0;
/** tile size in x */
int tdx;
/** tile size in y */
int tdy;
/* Tile info */
/** tile origin in x = XTOsiz */
OPJ_UINT32 tx0;
/** tile origin in y = YTOsiz */
OPJ_UINT32 ty0;
/** tile size in x = XTsiz */
OPJ_UINT32 tdx;
/** tile size in y = YTsiz */
OPJ_UINT32 tdy;
/** number of tiles in X */
int tw;
OPJ_UINT32 tw;
/** number of tiles in Y */
int th;
OPJ_UINT32 th;
/** number of decomposition for each component */
int *numdecompos;
/** number of components*/
OPJ_UINT32 nbcomps;
/** maximum distortion reduction on the whole image (add for Marcela) */
double D_max;
/** packet number */
int packno;
/** writing the packet in the index with t2_encode_packets */
int index_write;
/** Default information regarding tiles inside image */
opj_tile_info_v2_t m_default_tile_info;
/** information regarding tiles inside image */
opj_tile_info_v2_t *tile_info; /* FIXME not used for the moment */
} opj_codestream_info_v2_t;
/**
* Index structure about a tile
*/
typedef struct opj_tile_index {
/** number (index) of tile */
int tileno;
/** start position */
int start_pos;
/** end position of the header */
int end_header;
/** end position */
int end_pos;
/** number of tile parts */
int num_tps;
/** information concerning tile parts */
opj_tp_info_t *tp_index;
/** information concerning packets inside tile */
opj_packet_info_t *packet_index;
} opj_tile_index_t;
/**
* Index structure of the codestream (FIXME should be expand and enhance)
*/
typedef struct opj_codestream_index_ {
/** main header start position (SOC position) */
int main_head_start;
/** main header end position (first SOT position) */
int main_head_end;
/** codestream's size */
int codestream_size;
/* UniPG>> */
/** number of markers */
@ -980,17 +969,16 @@ typedef struct opj_codestream_info_v2 {
int maxmarknum;
/* <<UniPG */
/** main header position */
int main_head_start;
/** main header position */
int main_head_end;
/** codestream's size */
int codestream_size;
/** packet number */
int packno;
/** information regarding tiles inside image */
opj_tile_info_v2_t *tile;
} opj_codestream_info_v2_t;
/** */
int nb_of_tiles;
/** */
opj_tile_index_t *tile_index; /* FIXME not used for the moment */
}opj_codestream_index_t;
/* -----------------------------------------------------------> */
/*
==========================================================
@ -999,37 +987,24 @@ typedef struct opj_codestream_info_v2 {
*/
/**
Info structure of the file
* Info structure of the JP2 file
* FIXME
*/
typedef struct opj_jp2_metadata {
/** */
OPJ_INT32 empty_fields;
OPJ_INT32 not_used;
} opj_jp2_metadata_t;
/*
==========================================================
Information on the JPEG2000 file
==========================================================
*/
/**
Info structure of the file
* Index structure of the JP2 file
* FIXME
*/
typedef struct opj_file_info {
/** file format */
OPJ_INT32 file_format;
/** file info level*/
OPJ_INT32 file_info_flag;
/** image info*/
opj_image_header_t img_info;
/** codestream info */
opj_codestream_info_v2_t codestream_info;
/** file info */
opj_jp2_metadata_t jp2_metadata;
} opj_file_info_t;
typedef struct opj_jp2_index {
/** */
OPJ_INT32 not_used;
} opj_jp2_index_t;
#ifdef __cplusplus
@ -1066,6 +1041,12 @@ Deallocate any resources associated with an image
*/
OPJ_API void OPJ_CALLCONV opj_image_destroy(opj_image_t *image);
/**
* Deallocate any resources associated with an image header
*
* @param image_header image header to be destroyed
*/
OPJ_API void OPJ_CALLCONV opj_image_header_destroy(opj_image_header_t *image_header);
/*
@ -1106,6 +1087,8 @@ Set position in byte stream
*/
OPJ_API void OPJ_CALLCONV cio_seek(opj_cio_t *cio, int pos);
/* <----------- */
/* V2 framework */
/**
* Creates an abstract stream. This function does nothing except allocating memory and initializing the abstract stream.
@ -1171,7 +1154,7 @@ OPJ_API void OPJ_CALLCONV opj_stream_set_user_data (opj_stream_t* p_stream, void
OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (FILE * p_file, opj_bool p_is_read_stream);
OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (FILE * p_file, OPJ_UINT32 p_buffer_size, opj_bool p_is_read_stream);
/* -----------> */
/*
==========================================================
@ -1201,11 +1184,13 @@ OPJ_API void OPJ_CALLCONV opj_set_default_event_handler(opj_event_mgr_t * p_mana
codec functions definitions
==========================================================
*/
/**
Creates a J2K/JPT/JP2 decompression structure
@param format Decoder to select
@return Returns a handle to a decompressor if successful, returns NULL otherwise
*/
* Creates a J2K/JP2 decompression structure
* @param format Decoder to select
*
* @return Returns a handle to a decompressor if successful, returns NULL otherwise
* */
OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT format);
@ -1332,23 +1317,20 @@ OPJ_API void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info
/**
* Decodes an image header.
*
* @param p_codec codec to use to decode the image.
* @param p_image pointer to a previously created image.
* @param p_tile_x0 pointer to a value that will hold the reference point x0 of the tiling grid.
* @param p_tile_y0 pointer to a value that will hold the reference point y0 of the tiling grid.
* @param p_tile_width pointer to a value that will hold the size in x of a tile in the grid.
* @param p_tile_height pointer to a value that will hold the size in y of a tile in the grid.
* @param p_nb_tiles_x pointer to a value that will hold the number of tiles in the x direction.
* @param p_nb_tiles_y pointer to a value that will hold the number of tiles in the y direction.
* @param p_cio the jpeg2000 stream.
* @param p_codec the jpeg2000 codec to read.
* @param p_image header of the image hold in the codestream.
*
* @return true if the main header of the codestream and the JP2 header is correctly read.
*/
OPJ_API opj_bool OPJ_CALLCONV opj_read_header ( opj_stream_t *p_cio,
opj_codec_t *p_codec,
opj_file_info_t * p_file_info,
OPJ_INT32 file_info_flag);
opj_image_header_t * p_img_header);
/**
Destroy a decompressor handle
@param dinfo decompressor handle to destroy
* Destroy a decompressor handle
*
* @param dinfo decompressor handle to destroy
*/
OPJ_API void OPJ_CALLCONV opj_destroy_codec(opj_codec_t * p_codec);
@ -1417,6 +1399,65 @@ OPJ_API opj_bool OPJ_CALLCONV opj_decode_tile_data( opj_codec_t *p_codec,
opj_stream_t *p_stream );
/*
==========================================================
codec output functions definitions
==========================================================
*/
/**
* Dump the codec information into the output stream
*
* @param p_codec the jpeg2000 codec.
* @param info_flag type of information dump.
* @param output_stream output stream where dump the informations get from the codec.
*
*/
OPJ_API void OPJ_CALLCONV opj_dump_codec( opj_codec_t *p_codec,
OPJ_INT32 info_flag,
FILE* output_stream);
/**
* Get the codestream information from the codec
*
* @param p_codec the jpeg2000 codec.
*
* @return a pointer to a codestream information structure.
*
*/
OPJ_API opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(opj_codec_t *p_codec);
/**
* Get the codestream index from the codec
*
* @param p_codec the jpeg2000 codec.
*
* @return a pointer to a codestream index structure.
*
*/
OPJ_API opj_codestream_index_t * OPJ_CALLCONV opj_get_cstr_index(opj_codec_t *p_codec);
/**
* Get the JP2 file information from the codec FIXME
*
* @param p_codec the jpeg2000 codec.
*
* @return a pointer to a JP2 metadata structure.
*
*/
OPJ_API opj_jp2_metadata_t* OPJ_CALLCONV opj_get_jp2_metadata(opj_codec_t *p_codec);
/**
* Get the JP2 file index from the codec FIXME
*
* @param p_codec the jpeg2000 codec.
*
* @return a pointer to a JP2 index structure.
*
*/
OPJ_API opj_jp2_index_t* OPJ_CALLCONV opj_get_jp2_index(opj_codec_t *p_codec);
#ifdef __cplusplus
}
#endif

9
libopenjpeg/t2.c
View File

@ -844,7 +844,7 @@ opj_bool t2_decode_packets_v2(
OPJ_BYTE *p_src,
OPJ_UINT32 * p_data_read,
OPJ_UINT32 p_max_len,
struct opj_codestream_info_v2 *p_cstr_info)
opj_codestream_index_t *p_cstr_index)
{
OPJ_BYTE *l_current_data = p_src;
opj_pi_iterator_t *l_pi = 00;
@ -861,10 +861,11 @@ opj_bool t2_decode_packets_v2(
opj_packet_info_t *l_pack_info = 00;
opj_image_comp_header_t* l_img_comp = 00;
if (p_cstr_info) {
l_pack_info = p_cstr_info->tile[p_tile_no].packet;
#ifdef TODO_MSD
if (p_cstr_index) {
l_pack_info = p_cstr_index->tile_index[p_tile_no].packet;
}
#endif
/* create a packet iterator */
l_pi = pi_create_decode_v2(l_image, l_cp, p_tile_no);

2
libopenjpeg/t2.h
View File

@ -109,7 +109,7 @@ opj_bool t2_decode_packets_v2( opj_t2_v2_t *t2,
struct opj_tcd_tile_v2 *tile,
OPJ_BYTE *src, OPJ_UINT32 * p_data_read,
OPJ_UINT32 len,
struct opj_codestream_info_v2 *cstr_info);
opj_codestream_index_t *cstr_info);
/**
* Creates a Tier 2 handle

12
libopenjpeg/tcd.c
View File

@ -107,7 +107,7 @@ opj_bool tcd_t2_decode (
OPJ_BYTE * p_src_data,
OPJ_UINT32 * p_data_read,
OPJ_UINT32 p_max_src_size,
opj_codestream_info_v2_t *p_cstr_info
opj_codestream_index_t *p_cstr_index
);
opj_bool tcd_t1_decode (
@ -2008,12 +2008,13 @@ opj_bool tcd_decode_tile_v2(
OPJ_BYTE *p_src,
OPJ_UINT32 p_max_length,
OPJ_UINT32 p_tile_no,
opj_codestream_info_v2_t *p_cstr_info)
opj_codestream_index_t *p_cstr_index)
{
OPJ_UINT32 l_data_read;
p_tcd->tcd_tileno = p_tile_no;
p_tcd->tcp = &(p_tcd->cp->tcps[p_tile_no]);
#ifdef TODO_MSD /* FIXME */
/* INDEX >> */
if(p_cstr_info) {
OPJ_UINT32 resno, compno, numprec = 0;
@ -2034,12 +2035,13 @@ opj_bool tcd_decode_tile_v2(
p_cstr_info->packno = 0;
}
/* << INDEX */
#endif
/*--------------TIER2------------------*/
// FIXME _ProfStart(PGROUP_T2);
l_data_read = 0;
if
(! tcd_t2_decode(p_tcd, p_src, &l_data_read, p_max_length, p_cstr_info))
(! tcd_t2_decode(p_tcd, p_src, &l_data_read, p_max_length, p_cstr_index))
{
return OPJ_FALSE;
}
@ -2317,7 +2319,7 @@ opj_bool tcd_t2_decode (
OPJ_BYTE * p_src_data,
OPJ_UINT32 * p_data_read,
OPJ_UINT32 p_max_src_size,
opj_codestream_info_v2_t *p_cstr_info
opj_codestream_index_t *p_cstr_index
)
{
opj_t2_v2_t * l_t2;
@ -2337,7 +2339,7 @@ opj_bool tcd_t2_decode (
p_src_data,
p_data_read,
p_max_src_size,
p_cstr_info))
p_cstr_index))
{
t2_destroy_v2(l_t2);
return OPJ_FALSE;

2
libopenjpeg/tcd.h
View File

@ -487,7 +487,7 @@ opj_bool tcd_decode_tile_v2(opj_tcd_v2_t *tcd,
OPJ_BYTE *src,
OPJ_UINT32 len,
OPJ_UINT32 tileno,
struct opj_codestream_info_v2 *cstr_info);
opj_codestream_index_t *cstr_info);
/**