* Copies the decoding tile parameters onto all the tile parameters.
* Creates also the tile decoder.
*/
-opj_bool j2k_copy_default_tcp_and_create_tcd(
- opj_j2k_v2_t * p_j2k,
- opj_stream_private_t *p_stream,
- opj_event_mgr_t * p_manager
- );
+opj_bool j2k_copy_default_tcp_and_create_tcd ( opj_j2k_v2_t * p_j2k,
+ opj_stream_private_t *p_stream,
+ opj_event_mgr_t * p_manager );
/**
* Reads the lookup table containing all the marker, status and action, and returns the handler associated
*/
static void j2k_tcp_destroy (opj_tcp_v2_t *p_tcp);
+/**
+ * Destroys a codestream index structure.
+ *
+ * @param p_cstr_ind the codestream index parameter to destroy.
+ */
+static void j2k_destroy_cstr_index (opj_codestream_index_t* p_cstr_ind);
+
/**
* Destroys a coding parameter structure.
*
@param len length of marker segment
*/
static void j2k_add_mhmarker(opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len);
+
+static void j2k_add_mhmarker_v2(opj_codestream_index_t *cstr_index, OPJ_UINT32 type, OPJ_UINT32 pos, OPJ_UINT32 len) ;
/**
Add tile header marker information
@param tileno tile index number
/**
* Reads an unknown marker
*
- * @param p_stream the stream object to read from.
+ * @param p_stream the stream object to read from.
* @param p_j2k the jpeg2000 codec.
* @param p_manager the user event manager.
*
struct opj_stream_private *p_stream,
struct opj_event_mgr * p_manager );
+/**
+ * Copy the image header from the jpeg2000 codec into an external image_header
+ *
+ * @param p_j2k the jpeg2000 codec.
+ * @param p_image_header the external empty image header
+ *
+ * @return true if the image header is correctly copy.
+ */
+static opj_bool j2k_copy_img_header(opj_j2k_v2_t* p_j2k, opj_image_header_t* p_img_header);
+
+
+static void j2k_dump_MH_info(opj_j2k_v2_t* p_j2k, FILE* out_stream);
+
+static void j2k_dump_MH_index(opj_j2k_v2_t* p_j2k, FILE* out_stream);
+
+static opj_codestream_index_t* j2k_create_cstr_index(void);
+
/*@}*/
/*@}*/
* @param p_header_size the size of the data contained in the SOC marker.
* @param p_manager the user event manager.
*/
-static opj_bool j2k_read_soc_v2(
- opj_j2k_v2_t *p_j2k,
- struct opj_stream_private *p_stream,
- struct opj_event_mgr * p_manager
- )
+static opj_bool j2k_read_soc_v2( opj_j2k_v2_t *p_j2k,
+ struct opj_stream_private *p_stream,
+ struct opj_event_mgr * p_manager )
{
OPJ_BYTE l_data [2];
OPJ_UINT32 l_marker;
- // preconditions
+ /* preconditions */
assert(p_j2k != 00);
assert(p_manager != 00);
assert(p_stream != 00);
return OPJ_FALSE;
}
- /* assure length of data is correct (0) */
- p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_MHSIZ; // FIXME J2K_DEC_STATE_MHSIZ;
+ /* Next marker should be a SIZ marker in the main header */
+ p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_MHSIZ;
- /* Index */
- if (p_j2k->cstr_info) {
- //TODO p_j2k->cstr_info->main_head_start = opj_stream_tell(p_stream) - 2; // why - 2 ?
- p_j2k->cstr_info->codestream_size = 0;/*p_stream_numbytesleft(p_j2k->p_stream) + 2 - p_j2k->cstr_info->main_head_start*/;
- }
+ /* FIXME move it in a index structure included in p_j2k*/
+ p_j2k->cstr_index->main_head_start = (OPJ_UINT32) opj_stream_tell(p_stream) - 2;
+
+ opj_event_msg_v2(p_manager, EVT_INFO, "Start to read j2k main header (%d).\n", p_j2k->cstr_index->main_head_start);
+
+ /* Add the marker to the codestream index*/
+ j2k_add_mhmarker_v2(p_j2k->cstr_index, J2K_MS_SOC, p_j2k->cstr_index->main_head_start, 2);
return OPJ_TRUE;
}
p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_MH; // FIXME J2K_DEC_STATE_MH;
opj_image_comp_header_update(l_image,l_cp);
- /* Index */
- if (p_j2k->cstr_info) {
- int it_tile = 0;
-
- p_j2k->cstr_info->image_w = l_image->x1 - l_image->x0;
- p_j2k->cstr_info->image_h = l_image->y1 - l_image->y0;
- p_j2k->cstr_info->numcomps = l_image->numcomps;
- p_j2k->cstr_info->tw = l_cp->tw;
- p_j2k->cstr_info->th = l_cp->th;
- p_j2k->cstr_info->tdx = l_cp->tdx;
- p_j2k->cstr_info->tdy = l_cp->tdy;
- p_j2k->cstr_info->tx0 = l_cp->tx0;
- p_j2k->cstr_info->ty0 = l_cp->ty0;
-
- p_j2k->cstr_info->tile = (opj_tile_info_v2_t*) opj_calloc(l_nb_tiles, sizeof(opj_tile_info_v2_t));
- if (! p_j2k->cstr_info->tile) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory [SIZ marker]\n");
- return OPJ_FALSE;
- }
-
- for (it_tile = 0; it_tile < l_nb_tiles; it_tile++ ) {
- p_j2k->cstr_info->tile[it_tile].tccp_info =
- (opj_tccp_info_t*) opj_calloc( l_image->numcomps, sizeof(opj_tccp_info_t));
- if (! p_j2k->cstr_info->tile[it_tile].tccp_info) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory [SIZ marker]\n");
- return OPJ_FALSE;
- }
- }
- }
-
return OPJ_TRUE;
}
l_cp = &(p_j2k->m_cp);
/* If we are in the first tile-part header of the current tile */
- l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ? /*FIXME J2K_DEC_STATE_TPH)*/
+ l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ?
&l_cp->tcps[p_j2k->m_current_tile_number] :
p_j2k->m_specific_param.m_decoder.m_default_tcp;
return OPJ_FALSE;
}
+ /* Apply the coding style to other components of the current tile or the m_default_tcp*/
j2k_copy_tile_component_parameters(p_j2k);
/* Index */
+#ifdef WIP_REMOVE_MSD
if (p_j2k->cstr_info) {
//opj_codestream_info_t *l_cstr_info = p_j2k->cstr_info;
p_j2k->cstr_info->prog = l_tcp->prg;
p_j2k->cstr_info->numdecompos[i] = l_tcp->tccps[i].numresolutions - 1;
}
}
+#endif
+
return OPJ_TRUE;
}
struct opj_event_mgr * p_manager
)
{
- // preconditions
+ /* preconditions */
assert(p_header_data != 00);
assert(p_j2k != 00);
assert(p_manager != 00);
opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading QCD marker\n");
return OPJ_FALSE;
}
+
if (p_header_size != 0) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading QCD marker\n");
return OPJ_FALSE;
}
+
+ /* Apply the quantization parameters to other components of the current tile or the m_default_tcp */
j2k_copy_tile_quantization_parameters(p_j2k);
return OPJ_TRUE;
* @param p_header_size the size of the data contained in the QCC marker.
* @param p_manager the user event manager.
*/
-opj_bool j2k_read_qcc_v2(
- opj_j2k_v2_t *p_j2k,
+opj_bool j2k_read_qcc_v2( opj_j2k_v2_t *p_j2k,
OPJ_BYTE * p_header_data,
OPJ_UINT32 p_header_size,
struct opj_event_mgr * p_manager)
{
OPJ_UINT32 l_num_comp,l_comp_no;
- // preconditions
+ /* preconditions */
assert(p_header_data != 00);
assert(p_j2k != 00);
assert(p_manager != 00);
opj_tcp_v2_t *l_tcp = 00;
opj_poc_t *l_current_poc = 00;
- // preconditions
+ /* preconditions */
assert(p_header_data != 00);
assert(p_j2k != 00);
assert(p_manager != 00);
}
l_cp = &(p_j2k->m_cp);
- l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ? /* FIXME J2K_DEC_STATE_TPH*/
+ l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ?
&l_cp->tcps[p_j2k->m_current_tile_number] :
p_j2k->m_specific_param.m_decoder.m_default_tcp;
l_old_poc_nb = l_tcp->POC ? l_tcp->numpocs + 1 : 0;
/* Index */
- /* TODO move this onto a separate method to call before reading any SOT */
+ /* FIXME move this onto a separate method to call before reading any SOT, remove part about main_end header, use a index struct inside p_j2k */
/* if (p_j2k->cstr_info) {
if (l_tcp->first) {
if (tileno == 0) {
)
{
OPJ_UINT32 l_current_read_size;
- opj_codestream_info_v2_t * l_cstr_info = 00;
+ opj_codestream_index_t * l_cstr_index = 00;
OPJ_BYTE ** l_current_data = 00;
opj_tcp_v2_t * l_tcp = 00;
OPJ_UINT32 * l_tile_len = 00;
- // preconditions
+ /* preconditions */
assert(p_j2k != 00);
assert(p_manager != 00);
assert(p_stream != 00);
return OPJ_FALSE;
}
- l_cstr_info = p_j2k->cstr_info;
+ l_cstr_index = p_j2k->cstr_index;
/* Index */
-#ifdef TODO_MSD
- if (l_cstr_info) {
+ if (l_cstr_index) {
OPJ_SIZE_T l_current_pos = opj_stream_tell(p_stream)-1;
- l_cstr_info->tile[p_j2k->m_current_tile_number].tp[p_j2k->m_specific_param.m_encoder.m_current_tile_part_number].tp_end_header = l_current_pos;
+ l_cstr_index->tile_index[p_j2k->m_current_tile_number].tp_index[p_j2k->m_specific_param.m_encoder.m_current_tile_part_number].tp_end_header = l_current_pos;
- if (p_j2k->m_specific_param.m_encoder.m_current_tile_part_number == 0) {
- l_cstr_info->tile[p_j2k->m_current_tile_number].end_header = l_current_pos;
- }
-
- l_cstr_info->packno = 0;
+ l_cstr_index->packno = 0;
}
-#endif
l_current_read_size = opj_stream_read_data( p_stream,
*l_current_data + *l_tile_len,
}
l_cp = &(p_j2k->m_cp);
- l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ? /*FIXME J2K_DEC_STATE_TPH)*/
+ l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ?
&l_cp->tcps[p_j2k->m_current_tile_number] :
p_j2k->m_specific_param.m_decoder.m_default_tcp;
* @param p_header_size the size of the data contained in the SOD marker.
* @param p_manager the user event manager.
*/
-opj_bool j2k_read_eoc_v2 (
- opj_j2k_v2_t *p_j2k,
- struct opj_stream_private *p_stream,
- struct opj_event_mgr * p_manager
- )
+opj_bool j2k_read_eoc_v2 ( opj_j2k_v2_t *p_j2k,
+ struct opj_stream_private *p_stream,
+ struct opj_event_mgr * p_manager )
{
OPJ_UINT32 i;
opj_tcd_v2_t * l_tcd = 00;
opj_tcp_v2_t * l_tcp = 00;
opj_bool l_success;
- // preconditions
+ /* preconditions */
assert(p_j2k != 00);
assert(p_manager != 00);
assert(p_stream != 00);
return OPJ_FALSE;
}
- l_success = tcd_decode_tile_v2(l_tcd, l_tcp->m_data, l_tcp->m_data_size, i, p_j2k->cstr_info);
+ l_success = tcd_decode_tile_v2(l_tcd, l_tcp->m_data, l_tcp->m_data_size, i, p_j2k->cstr_index);
/* cleanup */
if (! l_success) {
- p_j2k->m_specific_param.m_decoder.m_state |= J2K_STATE_ERR; // TODO MSD J2K_DEC_STATE_ERR;
+ p_j2k->m_specific_param.m_decoder.m_state |= J2K_STATE_ERR;
break;
}
}
}
+static void j2k_add_mhmarker_v2(opj_codestream_index_t *cstr_index, OPJ_UINT32 type, OPJ_UINT32 pos, OPJ_UINT32 len) {
+
+ if (!cstr_index)
+ return;
+
+ /* expand the list? */
+ if ((cstr_index->marknum + 1) > cstr_index->maxmarknum) {
+ cstr_index->maxmarknum = 100 + (int) ((float) cstr_index ->maxmarknum * 1.0F);
+ cstr_index->marker = (opj_marker_info_t*)opj_realloc(cstr_index->marker, cstr_index->maxmarknum);
+ }
+
+ /* add the marker */
+ cstr_index->marker[cstr_index->marknum].type = type;
+ cstr_index->marker[cstr_index->marknum].pos = pos;
+ cstr_index->marker[cstr_index->marknum].len = len;
+ cstr_index->marknum++;
+
+}
+
static void j2k_add_tlmarker( int tileno, opj_codestream_info_t *cstr_info, unsigned short int type, int pos, int len) {
*/
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 )
{
/* preconditions */
assert(p_j2k != 00);
assert(p_stream != 00);
+ assert(p_img_header != 00);
assert(p_manager != 00);
/* create an empty image header */
return OPJ_FALSE;
}
- /* If necessary copy j2k header information into the output structure */
- if (p_file_info->file_info_flag & OPJ_J2K_INFO){
- fill_cstr_info( &(p_file_info->codestream_info), p_j2k, p_manager);
+ if (! j2k_copy_img_header(p_j2k, p_img_header)){
+ opj_image_header_destroy(p_j2k->m_image_header);
+ p_j2k->m_image_header = NULL;
+ return OPJ_FALSE;
}
- /* If necessary copy image header information into the output structure */
- if (p_file_info->file_info_flag & OPJ_IMG_INFO){
- fill_img_info( &(p_file_info->img_info), p_j2k, p_manager);
- }
return OPJ_TRUE;
}
-/**
- * Fill the image info struct from information read from main header.
- */
-opj_bool fill_img_info(opj_image_header_t* img_info, opj_j2k_v2_t* p_j2k, struct opj_event_mgr* p_manager)
+opj_bool j2k_copy_img_header(opj_j2k_v2_t* p_j2k, opj_image_header_t* p_img_header)
{
- opj_image_header_t* l_image_header = p_j2k->m_image_header;
-
- img_info->x0 = l_image_header->x0;
- img_info->y0 = l_image_header->y0;
- img_info->x1 = l_image_header->x1;
- img_info->y1 = l_image_header->y1;
- img_info->numcomps = l_image_header->numcomps;
-
- if (img_info->numcomps) {
- img_info->comps = (opj_image_comp_header_t*)opj_malloc(img_info->numcomps * sizeof(opj_image_comp_header_t));
- if (!img_info->comps){
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory\n");
- return OPJ_FALSE;
- }
-
- memcpy(img_info->comps, l_image_header->comps, img_info->numcomps * sizeof(opj_image_comp_header_t) );
- }
-
-
- img_info->icc_profile_len = l_image_header->icc_profile_len;
- if (img_info->icc_profile_len) {
- img_info->icc_profile_buf = (unsigned char*)opj_malloc(img_info->icc_profile_len * sizeof(unsigned char));
- if (!img_info->icc_profile_buf){
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory\n");
- return OPJ_FALSE;
- }
-
- memcpy(img_info->icc_profile_buf, l_image_header->icc_profile_buf, img_info->icc_profile_len);
- }
-
- return OPJ_TRUE;
-}
+ OPJ_UINT16 compno;
-/**
- * Fill the codestream info struct from information read from main header.
- */
-opj_bool fill_cstr_info(opj_codestream_info_v2_t* cstr_info, opj_j2k_v2_t* p_j2k, struct opj_event_mgr* p_manager)
-{
-
- //opj_cp_v2_t l_cp = p_j2k->m_cp;
- opj_image_header_t* l_image_header = p_j2k->m_image_header;
- int it_tile, it_comp;
- int nb_tiles, nb_comps;
-
- cstr_info->image_w = l_image_header->x1 - l_image_header->x0;
- cstr_info->image_h = l_image_header->y1 - l_image_header->y0;
- cstr_info->numcomps = l_image_header->numcomps;
- cstr_info->tw = p_j2k->m_cp.tw;
- cstr_info->th = p_j2k->m_cp.th;
- cstr_info->tdx = p_j2k->m_cp.tdx;
- cstr_info->tdy = p_j2k->m_cp.tdy;
- cstr_info->tx0 = p_j2k->m_cp.tx0;
- cstr_info->ty0 = p_j2k->m_cp.ty0;
+ /* preconditions */
+ assert(p_j2k != 00);
+ assert(p_img_header != 00);
- nb_tiles = p_j2k->m_cp.tw * p_j2k->m_cp.th;
- nb_comps = l_image_header->numcomps;
+ p_img_header->x0 = p_j2k->m_image_header->x0;
+ p_img_header->y0 = p_j2k->m_image_header->y0;
+ p_img_header->x1 = p_j2k->m_image_header->x1;
+ p_img_header->y1 = p_j2k->m_image_header->y1;
- cstr_info->tile = (opj_tile_info_v2_t*) opj_calloc(nb_tiles, sizeof(opj_tile_info_v2_t));
- if (! p_j2k->cstr_info->tile) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory\n");
+ p_img_header->numcomps = p_j2k->m_image_header->numcomps;
+ p_img_header->comps = (opj_image_comp_header_t*)opj_malloc(p_img_header->numcomps * sizeof(opj_image_comp_header_t));
+ if (!p_img_header->comps)
return OPJ_FALSE;
+ for (compno=0; compno < p_img_header->numcomps; compno++){
+ memcpy( &(p_img_header->comps[compno]),
+ &(p_j2k->m_image_header->comps[compno]),
+ sizeof(opj_image_comp_header_t));
}
- for (it_tile=0; it_tile < nb_tiles; it_tile++){
- cstr_info->tile[it_tile].tileno = it_tile;
- cstr_info->tile[it_tile].csty = p_j2k->m_cp.tcps[it_tile].csty;
- cstr_info->tile[it_tile].prg = p_j2k->m_cp.tcps[it_tile].prg;
- cstr_info->tile[it_tile].mct = p_j2k->m_cp.tcps[it_tile].mct;
- cstr_info->tile[it_tile].numlayers = p_j2k->m_cp.tcps[it_tile].numlayers;
- // FIXME Number of tile part l_cstr_info->tile[it_tile].num_tps = ;
-
- cstr_info->tile[it_tile].tccp_info =
- (opj_tccp_info_t*) opj_calloc(nb_comps, sizeof(opj_tccp_info_t));
- if (! p_j2k->cstr_info->tile[it_tile].tccp_info) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory\n");
- return OPJ_FALSE;
- }
-
- for (it_comp=0; it_comp < nb_comps; it_comp++){
- cstr_info->tile[it_tile].tccp_info[it_comp].compno = it_comp;
- cstr_info->tile[it_tile].tccp_info[it_comp].cblkh = p_j2k->m_cp.tcps[it_tile].tccps[it_comp].cblkh;
- cstr_info->tile[it_tile].tccp_info[it_comp].cblkw = p_j2k->m_cp.tcps[it_tile].tccps[it_comp].cblkw;
- cstr_info->tile[it_tile].tccp_info[it_comp].cblksty = p_j2k->m_cp.tcps[it_tile].tccps[it_comp].cblksty;
- cstr_info->tile[it_tile].tccp_info[it_comp].csty = p_j2k->m_cp.tcps[it_tile].tccps[it_comp].csty;
- cstr_info->tile[it_tile].tccp_info[it_comp].numgbits = p_j2k->m_cp.tcps[it_tile].tccps[it_comp].numgbits;
- cstr_info->tile[it_tile].tccp_info[it_comp].numresolutions = p_j2k->m_cp.tcps[it_tile].tccps[it_comp].numresolutions;
- cstr_info->tile[it_tile].tccp_info[it_comp].qmfbid = p_j2k->m_cp.tcps[it_tile].tccps[it_comp].qmfbid;
- cstr_info->tile[it_tile].tccp_info[it_comp].qntsty = p_j2k->m_cp.tcps[it_tile].tccps[it_comp].qntsty;
- cstr_info->tile[it_tile].tccp_info[it_comp].roishift = p_j2k->m_cp.tcps[it_tile].tccps[it_comp].roishift;
- }
- }
+ p_img_header->color_space = p_j2k->m_image_header->color_space;
+ p_img_header->icc_profile_len = p_j2k->m_image_header->icc_profile_len;
+ p_img_header->icc_profile_buf = (unsigned char*)opj_malloc(p_img_header->icc_profile_len);
+ if (!p_img_header->icc_profile_buf)
+ return OPJ_FALSE;
+ memcpy( p_img_header->icc_profile_buf,
+ p_j2k->m_image_header->icc_profile_buf,
+ p_j2k->m_image_header->icc_profile_len);
return OPJ_TRUE;
}
OPJ_UINT32 l_marker_size;
const opj_dec_memory_marker_handler_t * l_marker_handler = 00;
- // preconditions
+ /* preconditions */
assert(p_stream != 00);
assert(p_j2k != 00);
assert(p_manager != 00);
- p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_MHSOC; // The codestream must begin with SOC marker FIXME J2K_DEC_STATE_MHSOC
+ /* We enter in the main header */
+ p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_MHSOC;
- // Try to read the SOC marker
+ /* Try to read the SOC marker, the codestream must begin with SOC marker */
if (! j2k_read_soc_v2(p_j2k,p_stream,p_manager)) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Expected a SOC marker \n");
return OPJ_FALSE;
}
- // Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer
+ /* Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer */
if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
return OPJ_FALSE;
}
- // Read 2 bytes as the new marker ID
+ /* Read 2 bytes as the new marker ID */
opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
/* Try to read until the SOT is detected */
return OPJ_FALSE;
}
- // Get the marker handler from the marker ID
+ /* Get the marker handler from the marker ID */
l_marker_handler = j2k_get_marker_handler(l_current_marker);
- // Check if the marker is known and if it is the right place to find it
+ /* Check if the marker is known and if it is the right place to find it */
if (! (p_j2k->m_specific_param.m_decoder.m_state & l_marker_handler->states) ) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Marker is not compliant with its position\n");
return OPJ_FALSE;
}
- // Manage case where marker is unknown
+ /* Manage case where marker is unknown */
if (l_marker_handler->id == J2K_MS_UNK) {
-
+ OPJ_UINT32 l_size_unk = 2;
opj_event_msg_v2(p_manager, EVT_WARNING, "Unknown marker\n");
- // Try to detect the next valid marker
+ /* Try to detect the next valid marker */
while(1) {
- // Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer
+ /* Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer */
if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
return OPJ_FALSE;
}
- // Read 2 bytes as the new marker ID
+ /* Read 2 bytes as the new marker ID */
opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
- // Check if the current marker ID is valid
+ /* Check if the current marker ID is valid */
if ( !(l_current_marker < 0xff00) ) {
- // Get the marker handler from the marker ID
+ /* Get the marker handler from the marker ID */
l_marker_handler = j2k_get_marker_handler(l_current_marker);
if ( !(p_j2k->m_specific_param.m_decoder.m_state & l_marker_handler->states) ) {
return OPJ_FALSE;
}
else{
- if (l_marker_handler->id != J2K_MS_UNK)
- break; // next marker is known and well located
+ if (l_marker_handler->id != J2K_MS_UNK) {
+ /* Add the marker to the codestream index*/
+ j2k_add_mhmarker_v2(p_j2k->cstr_index, J2K_MS_UNK,
+ (OPJ_UINT32) opj_stream_tell(p_stream) - l_size_unk,
+ l_size_unk);
+ break; /* next marker is known and well located */
+ }
+ else
+ l_size_unk += 2;
}
}
}
+
if (l_current_marker == J2K_MS_SOT)
- break; // SOT marker is detected main header is completely read.
+ break; /* SOT marker is detected main header is completely read */
}
- // Try to read 2 bytes (the marker size) from stream and copy them into the buffer
+ /* Try to read 2 bytes (the marker size) from stream and copy them into the buffer */
if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
return OPJ_FALSE;
}
- // read 2 bytes as the marker size
+ /* read 2 bytes as the marker size */
opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_marker_size,2);
l_marker_size -= 2; // Subtract the size of the marker ID already read
- // Check if the marker size is compatible with the header data size
+ /* Check if the marker size is compatible with the header data size */
if (l_marker_size > p_j2k->m_specific_param.m_decoder.m_header_data_size) {
p_j2k->m_specific_param.m_decoder.m_header_data = (OPJ_BYTE*)
opj_realloc(p_j2k->m_specific_param.m_decoder.m_header_data,l_marker_size);
p_j2k->m_specific_param.m_decoder.m_header_data_size = l_marker_size;
}
- // Try to read the rest of the marker segment from stream and copy them into the buffer
+ /* Try to read the rest of the marker segment from stream and copy them into the buffer */
if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,l_marker_size,p_manager) != l_marker_size) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
return OPJ_FALSE;
}
- // Read the marker segment with the correct marker handler
+ /* Read the marker segment with the correct marker handler */
if (! (*(l_marker_handler->handler))(p_j2k,p_j2k->m_specific_param.m_decoder.m_header_data,l_marker_size,p_manager)) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Marker handler function failed to read the marker segment\n");
return OPJ_FALSE;
}
- // Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer
+ /* Add the marker to the codestream index*/
+ j2k_add_mhmarker_v2(p_j2k->cstr_index,
+ l_marker_handler->id,
+ (OPJ_UINT32) opj_stream_tell(p_stream) - l_marker_size - 4,
+ l_marker_size + 4 );
+
+ /* Try to read 2 bytes (the next marker ID) from stream and copy them into the buffer */
if (opj_stream_read_data(p_stream,p_j2k->m_specific_param.m_decoder.m_header_data,2,p_manager) != 2) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
return OPJ_FALSE;
}
- // read 2 bytes as the new marker ID
+ /* read 2 bytes as the new marker ID */
opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
}
- p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT; // FIXME J2K_DEC_STATE_TPHSOT
+ opj_event_msg_v2(p_manager, EVT_INFO, "Main header has been correctly decode.\n");
+
+ /* Position of the last element if the main header */
+ p_j2k->cstr_index->main_head_end = (OPJ_UINT32) opj_stream_tell(p_stream) - 2;
+
+ /* Next step: read a tile-part header */
+ p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT;
+
return OPJ_TRUE;
}
*
* @return true if all the procedures were successfully executed.
*/
-opj_bool j2k_exec (
- opj_j2k_v2_t * p_j2k,
+opj_bool j2k_exec ( opj_j2k_v2_t * p_j2k,
opj_procedure_list_t * p_procedure_list,
opj_stream_private_t *p_stream,
- opj_event_mgr_t * p_manager
- )
+ opj_event_mgr_t * p_manager )
{
opj_bool (** l_procedure) (opj_j2k_v2_t * ,opj_stream_private_t *,opj_event_mgr_t *) = 00;
opj_bool l_result = OPJ_TRUE;
return l_result;
}
-
+/* FIXME DOC*/
opj_bool j2k_copy_default_tcp_and_create_tcd
(
opj_j2k_v2_t * p_j2k,
opj_simple_mcc_decorrelation_data_t * l_src_mcc_rec, *l_dest_mcc_rec;
OPJ_UINT32 l_offset;
- // preconditions in debug
+ /* preconditions */
assert(p_j2k != 00);
assert(p_stream != 00);
assert(p_manager != 00);
-
l_image = p_j2k->m_image_header;
l_nb_tiles = p_j2k->m_cp.th * p_j2k->m_cp.tw;
l_tcp = p_j2k->m_cp.tcps;
l_tccp_size = l_image->numcomps * sizeof(opj_tccp_t);
l_default_tcp = p_j2k->m_specific_param.m_decoder.m_default_tcp;
l_mct_size = l_image->numcomps * l_image->numcomps * sizeof(OPJ_FLOAT32);
- for
- (i=0;i<l_nb_tiles;++i)
- {
+
+ /* For each tile */
+ for (i=0; i<l_nb_tiles; ++i) {
l_current_tccp = l_tcp->tccps;
- memcpy(l_tcp,l_default_tcp, sizeof(opj_tcp_v2_t));
+ memcpy(l_tcp, l_default_tcp, sizeof(opj_tcp_v2_t));
l_tcp->ppt = 0;
l_tcp->ppt_data = 00;
l_tcp->tccps = l_current_tccp;
- if
- (l_default_tcp->m_mct_decoding_matrix)
- {
+
+ if (l_default_tcp->m_mct_decoding_matrix) {
l_tcp->m_mct_decoding_matrix = (OPJ_FLOAT32*)opj_malloc(l_mct_size);
- if
- (! l_tcp->m_mct_decoding_matrix )
- {
+ if (! l_tcp->m_mct_decoding_matrix ) {
return OPJ_FALSE;
}
memcpy(l_tcp->m_mct_decoding_matrix,l_default_tcp->m_mct_decoding_matrix,l_mct_size);
}
+
l_mct_records_size = l_default_tcp->m_nb_max_mct_records * sizeof(opj_mct_data_t);
l_tcp->m_mct_records = (opj_mct_data_t*)opj_malloc(l_mct_records_size);
- if
- (! l_tcp->m_mct_records)
- {
+ if (! l_tcp->m_mct_records) {
return OPJ_FALSE;
}
memcpy(l_tcp->m_mct_records, l_default_tcp->m_mct_records,l_mct_records_size);
+
l_src_mct_rec = l_default_tcp->m_mct_records;
l_dest_mct_rec = l_tcp->m_mct_records;
- for
- (j=0;j<l_default_tcp->m_nb_mct_records;++j)
- {
- if
- (l_src_mct_rec->m_data)
- {
- l_dest_mct_rec->m_data = (OPJ_BYTE*)
- opj_malloc(l_src_mct_rec->m_data_size);
- if
- (! l_dest_mct_rec->m_data)
- {
+
+ for (j=0;j<l_default_tcp->m_nb_mct_records;++j) {
+
+ if (l_src_mct_rec->m_data) {
+
+ l_dest_mct_rec->m_data = (OPJ_BYTE*) opj_malloc(l_src_mct_rec->m_data_size);
+ if(! l_dest_mct_rec->m_data) {
return OPJ_FALSE;
}
memcpy(l_dest_mct_rec->m_data,l_src_mct_rec->m_data,l_src_mct_rec->m_data_size);
}
+
++l_src_mct_rec;
++l_dest_mct_rec;
}
+
l_mcc_records_size = l_default_tcp->m_nb_max_mcc_records * sizeof(opj_simple_mcc_decorrelation_data_t);
- l_tcp->m_mcc_records = (opj_simple_mcc_decorrelation_data_t*)
- opj_malloc(l_mcc_records_size);
- if
- (! l_tcp->m_mcc_records)
- {
+ l_tcp->m_mcc_records = (opj_simple_mcc_decorrelation_data_t*) opj_malloc(l_mcc_records_size);
+ if (! l_tcp->m_mcc_records) {
return OPJ_FALSE;
}
memcpy(l_tcp->m_mcc_records,l_default_tcp->m_mcc_records,l_mcc_records_size);
+
l_src_mcc_rec = l_default_tcp->m_mcc_records;
l_dest_mcc_rec = l_tcp->m_mcc_records;
- for
- (j=0;j<l_default_tcp->m_nb_max_mcc_records;++j)
- {
- if
- (l_src_mcc_rec->m_decorrelation_array)
- {
+ for (j=0;j<l_default_tcp->m_nb_max_mcc_records;++j) {
+
+ if (l_src_mcc_rec->m_decorrelation_array) {
l_offset = l_src_mcc_rec->m_decorrelation_array - l_default_tcp->m_mct_records;
l_dest_mcc_rec->m_decorrelation_array = l_tcp->m_mct_records + l_offset;
}
- if
- (l_src_mcc_rec->m_offset_array)
- {
+
+ if (l_src_mcc_rec->m_offset_array) {
l_offset = l_src_mcc_rec->m_offset_array - l_default_tcp->m_mct_records;
l_dest_mcc_rec->m_offset_array = l_tcp->m_mct_records + l_offset;
}
+
++l_src_mcc_rec;
++l_dest_mcc_rec;
}
+
memcpy(l_current_tccp,l_default_tcp->tccps,l_tccp_size);
++l_tcp;
}
+
p_j2k->m_tcd = (opj_tcd_v2_t*)tcd_create_v2(OPJ_TRUE); // FIXME why a cast ?
- if
- (! p_j2k->m_tcd )
- {
+ if (! p_j2k->m_tcd ) {
return OPJ_FALSE;
}
- if
- (! tcd_init_v2(p_j2k->m_tcd, l_image, &(p_j2k->m_cp)))
- {
+
+ if ( !tcd_init_v2(p_j2k->m_tcd, l_image, &(p_j2k->m_cp)) ) {
tcd_destroy_v2(p_j2k->m_tcd);
p_j2k->m_tcd = 00;
opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot decode tile, memory error\n");
return OPJ_FALSE;
}
+
return OPJ_TRUE;
}
*/
void j2k_destroy (opj_j2k_v2_t *p_j2k)
{
- if
- (p_j2k == 00)
- {
+ if (p_j2k == 00) {
return;
}
- if
- (p_j2k->m_is_decoder)
- {
- if
- (p_j2k->m_specific_param.m_decoder.m_default_tcp != 00)
- {
+ if (p_j2k->m_is_decoder) {
+
+ if (p_j2k->m_specific_param.m_decoder.m_default_tcp != 00) {
j2k_tcp_destroy(p_j2k->m_specific_param.m_decoder.m_default_tcp);
opj_free(p_j2k->m_specific_param.m_decoder.m_default_tcp);
p_j2k->m_specific_param.m_decoder.m_default_tcp = 00;
}
- if
- (p_j2k->m_specific_param.m_decoder.m_header_data != 00)
- {
+
+ if (p_j2k->m_specific_param.m_decoder.m_header_data != 00) {
opj_free(p_j2k->m_specific_param.m_decoder.m_header_data);
p_j2k->m_specific_param.m_decoder.m_header_data = 00;
p_j2k->m_specific_param.m_decoder.m_header_data_size = 0;
}
-
}
- else
- {
- if
- (p_j2k->m_specific_param.m_encoder.m_encoded_tile_data)
- {
+ else {
+
+ if (p_j2k->m_specific_param.m_encoder.m_encoded_tile_data) {
opj_free(p_j2k->m_specific_param.m_encoder.m_encoded_tile_data);
p_j2k->m_specific_param.m_encoder.m_encoded_tile_data = 00;
}
- if
- (p_j2k->m_specific_param.m_encoder.m_tlm_sot_offsets_buffer)
- {
+
+ if (p_j2k->m_specific_param.m_encoder.m_tlm_sot_offsets_buffer) {
opj_free(p_j2k->m_specific_param.m_encoder.m_tlm_sot_offsets_buffer);
p_j2k->m_specific_param.m_encoder.m_tlm_sot_offsets_buffer = 00;
p_j2k->m_specific_param.m_encoder.m_tlm_sot_offsets_current = 00;
}
- if
- (p_j2k->m_specific_param.m_encoder.m_header_tile_data)
- {
+
+ if (p_j2k->m_specific_param.m_encoder.m_header_tile_data) {
opj_free(p_j2k->m_specific_param.m_encoder.m_header_tile_data);
p_j2k->m_specific_param.m_encoder.m_header_tile_data = 00;
p_j2k->m_specific_param.m_encoder.m_header_tile_data_size = 0;
}
}
+
tcd_destroy_v2(p_j2k->m_tcd);
j2k_cp_destroy(&(p_j2k->m_cp));
opj_procedure_list_destroy(p_j2k->m_validation_list);
p_j2k->m_procedure_list = 00;
+ j2k_destroy_cstr_index(p_j2k->cstr_index);
+ p_j2k->cstr_index = NULL;
+
opj_free(p_j2k);
}
+void j2k_destroy_cstr_index (opj_codestream_index_t *p_cstr_ind)
+{
+ if (!p_cstr_ind) {
+ return;
+ }
+
+ if (p_cstr_ind->marker) {
+ opj_free(p_cstr_ind->marker);
+ p_cstr_ind->marker = NULL;
+ }
+
+ if (p_cstr_ind->tile_index) {
+ // FIXME
+ }
+}
+
/**
*/
void j2k_tcp_destroy (opj_tcp_v2_t *p_tcp)
{
- if
- (p_tcp == 00)
- {
+ if (p_tcp == 00) {
return;
}
- if
- (p_tcp->ppt_buffer != 00)
- {
+
+ if (p_tcp->ppt_buffer != 00) {
opj_free(p_tcp->ppt_buffer);
p_tcp->ppt_buffer = 00;
}
- if
- (p_tcp->tccps != 00)
- {
+
+ if (p_tcp->tccps != 00) {
opj_free(p_tcp->tccps);
p_tcp->tccps = 00;
}
- if
- (p_tcp->m_mct_coding_matrix != 00)
- {
+
+ if (p_tcp->m_mct_coding_matrix != 00) {
opj_free(p_tcp->m_mct_coding_matrix);
p_tcp->m_mct_coding_matrix = 00;
}
- if
- (p_tcp->m_mct_decoding_matrix != 00)
- {
+
+ if (p_tcp->m_mct_decoding_matrix != 00) {
opj_free(p_tcp->m_mct_decoding_matrix);
p_tcp->m_mct_decoding_matrix = 00;
}
- if
- (p_tcp->m_mcc_records)
- {
+
+ if (p_tcp->m_mcc_records) {
opj_free(p_tcp->m_mcc_records);
p_tcp->m_mcc_records = 00;
p_tcp->m_nb_max_mcc_records = 0;
p_tcp->m_nb_mcc_records = 0;
}
- if
- (p_tcp->m_mct_records)
- {
+
+ if (p_tcp->m_mct_records) {
opj_mct_data_t * l_mct_data = p_tcp->m_mct_records;
OPJ_UINT32 i;
- for
- (i=0;i<p_tcp->m_nb_mct_records;++i)
- {
- if
- (l_mct_data->m_data)
- {
+
+ for (i=0;i<p_tcp->m_nb_mct_records;++i) {
+ if (l_mct_data->m_data) {
opj_free(l_mct_data->m_data);
l_mct_data->m_data = 00;
}
+
++l_mct_data;
}
+
opj_free(p_tcp->m_mct_records);
p_tcp->m_mct_records = 00;
}
- if
- (p_tcp->mct_norms != 00)
- {
+ if (p_tcp->mct_norms != 00) {
opj_free(p_tcp->mct_norms);
p_tcp->mct_norms = 00;
}
- if
- (p_tcp->m_data)
- {
+
+ if (p_tcp->m_data) {
opj_free(p_tcp->m_data);
p_tcp->m_data = 00;
}
l_tcp->m_data,
l_tcp->m_data_size,
p_tile_index,
- p_j2k->cstr_info) ) {
+ p_j2k->cstr_index) ) {
j2k_tcp_destroy(l_tcp);
p_j2k->m_specific_param.m_decoder.m_state |= 0x8000;//FIXME J2K_DEC_STATE_ERR;
return OPJ_FALSE;
l_j2k->m_is_decoder = 1;
l_j2k->m_cp.m_is_decoder = 1;
- l_j2k->m_specific_param.m_decoder.m_default_tcp = (opj_tcp_v2_t*) opj_malloc(sizeof(opj_tcp_v2_t));
+ l_j2k->m_specific_param.m_decoder.m_default_tcp = (opj_tcp_v2_t*) opj_malloc(sizeof(opj_tcp_v2_t));
if (!l_j2k->m_specific_param.m_decoder.m_default_tcp) {
- opj_free(l_j2k);
+ j2k_destroy(l_j2k);
return 00;
}
memset(l_j2k->m_specific_param.m_decoder.m_default_tcp,0,sizeof(opj_tcp_v2_t));
l_j2k->m_specific_param.m_decoder.m_header_data_size = J2K_DEFAULT_HEADER_SIZE;
- // codestream info creation
- l_j2k->cstr_info = (opj_codestream_info_v2_t*) opj_malloc(sizeof(opj_codestream_info_v2_t));
- if (!l_j2k->cstr_info){
- opj_free(l_j2k);
+ /* codestream index creation */
+ l_j2k->cstr_index = j2k_create_cstr_index();
+
+ /*(opj_codestream_index_t*) opj_malloc(sizeof(opj_codestream_index_t));
+ if (!l_j2k->cstr_index){
+ j2k_destroy(l_j2k);
return NULL;
}
- // validation list creation
+ l_j2k->cstr_index->marker = (opj_marker_info_t*) opj_malloc(100 * sizeof(opj_marker_info_t));
+*/
+
+ /* validation list creation */
l_j2k->m_validation_list = opj_procedure_list_create();
if (! l_j2k->m_validation_list) {
j2k_destroy(l_j2k);
return 00;
}
- // execution list creation
+ /* execution list creation */
l_j2k->m_procedure_list = opj_procedure_list_create();
if (! l_j2k->m_procedure_list) {
j2k_destroy(l_j2k);
}
+opj_codestream_index_t* j2k_create_cstr_index(void)
+{
+ opj_codestream_index_t* cstr_index = (opj_codestream_index_t*)
+ opj_calloc(1,sizeof(opj_codestream_index_t));
+ if (!cstr_index)
+ return NULL;
+
+ cstr_index->maxmarknum = 100;
+ cstr_index->marker = (opj_marker_info_t*)
+ opj_calloc(cstr_index->maxmarknum, sizeof(opj_marker_info_t));
+ if (!cstr_index-> marker)
+ return NULL;
+
+ cstr_index->tile_index = NULL;
+
+ return cstr_index;
+}
+
/**
* Reads a SPCod or SPCoc element, i.e. the coding style of a given component of a tile.
* @param p_header_data the data contained in the COM box.
assert(p_header_data != 00);
l_cp = &(p_j2k->m_cp);
- l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ? /* FIXME J2K_DEC_STATE_TPH*/
+ l_tcp = (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH) ?
&l_cp->tcps[p_j2k->m_current_tile_number] :
p_j2k->m_specific_param.m_decoder.m_default_tcp;
}
}
+#ifdef WIP_REMOVE_MSD
/* INDEX >> */
if (p_j2k->cstr_info && compno == 0) {
OPJ_UINT32 l_data_size = l_tccp->numresolutions * sizeof(OPJ_UINT32);
memcpy(p_j2k->cstr_info->tile[p_j2k->m_current_tile_number].pdy,l_tccp->prch, l_data_size);
}
/* << INDEX */
+#endif
+
return OPJ_TRUE;
}
return OPJ_TRUE;
}
-
-
/**
* Copies the tile component parameters of all the component from the first tile component.
*
opj_tccp_t *l_copied_tccp = NULL;
OPJ_UINT32 l_size;
- // preconditions
+ /* preconditions */
assert(p_j2k != 00);
l_cp = &(p_j2k->m_cp);
- l_tcp = p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH /* FIXME J2K_DEC_STATE_TPH*/ ? &l_cp->tcps[p_j2k->m_current_tile_number] : p_j2k->m_specific_param.m_decoder.m_default_tcp;
- // precondition again
+ l_tcp = p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_TPH ?
+ &l_cp->tcps[p_j2k->m_current_tile_number] :
+ p_j2k->m_specific_param.m_decoder.m_default_tcp;
+
l_ref_tccp = &l_tcp->tccps[0];
l_copied_tccp = l_ref_tccp + 1;
l_size = J2K_MAXBANDS * sizeof(opj_stepsize_t);
++l_copied_tccp;
}
}
+
+/**
+ * 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)
+{
+ /* Check if the flag is compatible with j2k file*/
+ if ( (flag & OPJ_JP2_INFO) || (flag & OPJ_JP2_IND)){
+ fprintf(out_stream, "Wrong flag\n");
+ return;
+ }
+
+ /* Dump the image_header */
+ if (flag & OPJ_IMG_INFO){
+ if (p_j2k->m_image_header)
+ j2k_dump_image_header(p_j2k->m_image_header, 0, out_stream);
+ }
+
+ /* Dump the codestream info from main header */
+ if (flag & OPJ_J2K_MH_INFO){
+ j2k_dump_MH_info(p_j2k, out_stream);
+ }
+
+
+ /* Dump the codestream info of the current tile */
+ if (flag & OPJ_J2K_TH_INFO){
+
+ }
+
+ /* Dump the codestream index from main header */
+ if (flag & OPJ_J2K_MH_IND){
+ j2k_dump_MH_index(p_j2k, out_stream);
+ }
+
+ /* Dump the codestream index of the current tile */
+ if (flag & OPJ_J2K_TH_IND){
+
+ }
+
+}
+
+/**
+ * Dump index elements of the codestream extract from the main header.
+ *
+ *@param p_j2k the jpeg2000 codec.
+ *@param out_stream output stream where dump the elements.
+ *
+*/
+void j2k_dump_MH_index(opj_j2k_v2_t* p_j2k, FILE* out_stream)
+{
+ opj_codestream_index_t* cstr_index = p_j2k->cstr_index;
+ OPJ_UINT32 it_marker;
+
+ fprintf(out_stream, "Codestream index from main header: {\n");
+
+ fprintf(out_stream, "\t Main header start position=%d\n\t Main header end position=%d\n",
+ cstr_index->main_head_start, cstr_index->main_head_end);
+
+ fprintf(out_stream, "\t Marker list: {\n");
+
+ for (it_marker=0; it_marker < cstr_index->marknum ; it_marker++){
+ fprintf(out_stream, "\t\t type=%#x, pos=%d, len=%d\n",
+ cstr_index->marker[it_marker].type,
+ cstr_index->marker[it_marker].pos,
+ cstr_index->marker[it_marker].len );
+ }
+
+ fprintf(out_stream, "\t }\n}\n");
+
+}
+
+/**
+ * Dump info elements of the codestream extract from the main header.
+ *
+ *@param p_j2k the jpeg2000 codec.
+ *@param out_stream output stream where dump the elements.
+ *
+*/
+void j2k_dump_MH_info(opj_j2k_v2_t* p_j2k, FILE* out_stream)
+{
+ opj_tcp_v2_t * l_default_tile=NULL;
+
+ fprintf(out_stream, "Codestream info from main header: {\n");
+
+ fprintf(out_stream, "\t tx0=%d, ty0=%d\n", p_j2k->m_cp.tx0, p_j2k->m_cp.ty0);
+ fprintf(out_stream, "\t tdx=%d, tdy=%d\n", p_j2k->m_cp.tdx, p_j2k->m_cp.tdy);
+ fprintf(out_stream, "\t tw=%d, th=%d\n", p_j2k->m_cp.tw, p_j2k->m_cp.th);
+
+ l_default_tile = p_j2k->m_specific_param.m_decoder.m_default_tcp;
+ if (l_default_tile)
+ {
+ OPJ_INT32 compno;
+ OPJ_INT32 numcomps = p_j2k->m_image_header->numcomps;
+
+ fprintf(out_stream, "\t default tile {\n");
+ fprintf(out_stream, "\t\t csty=%#x\n", l_default_tile->csty);
+ fprintf(out_stream, "\t\t prg=%#x\n", l_default_tile->prg);
+ fprintf(out_stream, "\t\t numlayers=%d\n", l_default_tile->numlayers);
+ fprintf(out_stream, "\t\t mct=%x\n", l_default_tile->mct);
+
+ for (compno = 0; compno < numcomps; compno++) {
+ opj_tccp_t *l_tccp = &(l_default_tile->tccps[compno]);
+ OPJ_INT32 resno, bandno, numbands;
+
+ /* coding style*/
+ fprintf(out_stream, "\t\t comp %d {\n", compno);
+ fprintf(out_stream, "\t\t\t csty=%#x\n", l_tccp->csty);
+ fprintf(out_stream, "\t\t\t numresolutions=%d\n", l_tccp->numresolutions);
+ fprintf(out_stream, "\t\t\t cblkw=2^%d\n", l_tccp->cblkw);
+ fprintf(out_stream, "\t\t\t cblkh=2^%d\n", l_tccp->cblkh);
+ fprintf(out_stream, "\t\t\t cblksty=%#x\n", l_tccp->cblksty);
+ fprintf(out_stream, "\t\t\t qmfbid=%d\n", l_tccp->qmfbid);
+
+ fprintf(out_stream, "\t\t\t preccintsize (w,h)=");
+ for (resno = 0; resno < l_tccp->numresolutions; resno++) {
+ fprintf(out_stream, "(%d,%d) ", l_tccp->prcw[resno], l_tccp->prch[resno]);
+ }
+ fprintf(out_stream, "\n");
+
+ /* quantization style*/
+ fprintf(out_stream, "\t\t\t qntsty=%d\n", l_tccp->qntsty);
+ fprintf(out_stream, "\t\t\t numgbits=%d\n", l_tccp->numgbits);
+ fprintf(out_stream, "\t\t\t stepsizes (m,e)=");
+ numbands = (l_tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) ? 1 : l_tccp->numresolutions * 3 - 2;
+ for (bandno = 0; bandno < numbands; bandno++) {
+ fprintf(out_stream, "(%d,%d) ", l_tccp->stepsizes[bandno].mant,
+ l_tccp->stepsizes[bandno].expn);
+ }
+ fprintf(out_stream, "\n");
+
+ /* RGN value*/
+ fprintf(out_stream, "\t\t\t roishift=%d\n", l_tccp->roishift);
+
+ fprintf(out_stream, "\t\t }\n");
+ } /*end of component of default tile*/
+ fprintf(out_stream, "\t }\n"); /*end of default tile*/
+
+ }
+
+ fprintf(out_stream, "}\n");
+
+}
+
+/**
+ * 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)
+{
+ char tab[2];
+
+ if (dev_dump_flag){
+ fprintf(stdout, "[DEV] Dump a image_header struct {\n");
+ tab[0] = '\0';
+ }
+ else {
+ fprintf(out_stream, "Image info {\n");
+ tab[0] = '\t';tab[1] = '\0';
+ }
+
+ fprintf(out_stream, "%s x0=%d, y0=%d\n", tab, img_header->x0, img_header->y0);
+ fprintf(out_stream, "%s x1=%d, y1=%d\n", tab, img_header->x1, img_header->y1);
+ fprintf(out_stream, "%s numcomps=%d\n", tab, img_header->numcomps);
+
+ if (img_header->comps){
+ int compno;
+ for (compno = 0; compno < img_header->numcomps; compno++) {
+ fprintf(out_stream, "%s\t component %d {\n", tab, compno);
+ j2k_dump_image_comp_header(&(img_header->comps[compno]), dev_dump_flag, out_stream);
+ fprintf(out_stream,"%s}\n",tab);
+ }
+ }
+
+ fprintf(out_stream, "}\n");
+}
+
+/**
+ * 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)
+{
+ char tab[3];
+
+ if (dev_dump_flag){
+ fprintf(stdout, "[DEV] Dump a image_comp_header struct {\n");
+ tab[0] = '\0';
+ } else {
+ tab[0] = '\t';tab[1] = '\t';tab[2] = '\0';
+ }
+
+ fprintf(out_stream, "%s dx=%d, dy=%d\n", tab, comp_header->dx, comp_header->dy);
+ fprintf(out_stream, "%s prec=%d\n", tab, comp_header->prec);
+ fprintf(out_stream, "%s sgnd=%d\n", tab, comp_header->sgnd);
+
+ if (dev_dump_flag)
+ fprintf(out_stream, "}\n");
+}
+
+
+/**
+ * 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)
+{
+ OPJ_UINT16 compno;
+ OPJ_UINT16 numcomps = p_j2k->m_image_header->numcomps;
+ opj_tcp_v2_t *l_default_tile;
+ opj_codestream_info_v2_t* cstr_info = (opj_codestream_info_v2_t*) opj_calloc(1,sizeof(opj_codestream_info_v2_t));
+
+ cstr_info->nbcomps = p_j2k->m_image_header->numcomps;
+
+ cstr_info->tx0 = p_j2k->m_cp.tx0;
+ cstr_info->ty0 = p_j2k->m_cp.ty0;
+ cstr_info->tdx = p_j2k->m_cp.tdx;
+ cstr_info->tdy = p_j2k->m_cp.tdy;
+ cstr_info->tw = p_j2k->m_cp.tw;
+ cstr_info->th = p_j2k->m_cp.th;
+
+ l_default_tile = p_j2k->m_specific_param.m_decoder.m_default_tcp;
+
+ cstr_info->m_default_tile_info.csty = l_default_tile->csty;
+ cstr_info->m_default_tile_info.prg = l_default_tile->prg;
+ cstr_info->m_default_tile_info.numlayers = l_default_tile->numlayers;
+ cstr_info->m_default_tile_info.mct = l_default_tile->mct;
+
+ cstr_info->m_default_tile_info.tccp_info = (opj_tccp_info_t*) opj_calloc(1,sizeof(opj_tccp_info_t));
+
+ for (compno = 0; compno < numcomps; compno++) {
+ opj_tccp_t *l_tccp = &(l_default_tile->tccps[compno]);
+ opj_tccp_info_t *l_tccp_info = &(cstr_info->m_default_tile_info.tccp_info[compno]);
+ OPJ_INT32 bandno, numbands;
+
+ /* coding style*/
+ l_tccp_info->csty = l_tccp->csty;
+ l_tccp_info->numresolutions = l_tccp->numresolutions;
+ l_tccp_info->cblkw = l_tccp->cblkw;
+ l_tccp_info->cblkh = l_tccp->cblkh;
+ l_tccp_info->cblksty = l_tccp->cblksty;
+ l_tccp_info->qmfbid = l_tccp->qmfbid;
+ if (l_tccp->numresolutions < J2K_MAXRLVLS)
+ {
+ memcpy(l_tccp_info->prch, l_tccp->prch, l_tccp->numresolutions);
+ memcpy(l_tccp_info->prcw, l_tccp->prcw, l_tccp->numresolutions);
+ }
+
+ /* quantization style*/
+ l_tccp_info->qntsty = l_tccp->qntsty;
+ l_tccp_info->numgbits = l_tccp->numgbits;
+
+ numbands = (l_tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) ? 1 : l_tccp->numresolutions * 3 - 2;
+ if (numbands < J2K_MAXBANDS) {
+ for (bandno = 0; bandno < numbands; bandno++) {
+ l_tccp_info->stepsizes_mant[bandno] = l_tccp->stepsizes[bandno].mant;
+ l_tccp_info->stepsizes_expn[bandno] = l_tccp->stepsizes[bandno].expn;
+ }
+ }
+
+ /* RGN value*/
+ l_tccp_info->roishift = l_tccp->roishift;
+ }
+
+
+ return cstr_info;
+}
+
+/**
+ * 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)
+{
+ opj_codestream_index_t* l_cstr_index = (opj_codestream_index_t*)
+ opj_calloc(1,sizeof(opj_codestream_index_t));
+ if (!l_cstr_index)
+ return NULL;
+
+ l_cstr_index->main_head_start = p_j2k->cstr_index->main_head_start;
+ l_cstr_index->main_head_end = p_j2k->cstr_index->main_head_end;
+ l_cstr_index->codestream_size = p_j2k->cstr_index->codestream_size;
+
+ l_cstr_index->maxmarknum = p_j2k->cstr_index->maxmarknum;
+ l_cstr_index->marknum = p_j2k->cstr_index->marknum;
+ l_cstr_index->marker = (opj_marker_info_t*)opj_malloc(l_cstr_index->marknum*sizeof(opj_marker_info_t));
+ if (!l_cstr_index->marker)
+ return NULL;
+
+ memcpy(l_cstr_index->marker, p_j2k->cstr_index->marker, l_cstr_index->marknum * sizeof(opj_marker_info_t) );
+
+
+ return l_cstr_index;
+}
* 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
#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
/**
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 */
/*
*/
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*/
*/
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];
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>> */
*/
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. */
} opj_dinfo_t;
/**
- * J2k codec.
+ * JPEG2000 codec.
*/
typedef void * opj_codec_t;
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;
/*
/** 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 */
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
{
/** component index */
/** 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 */
}
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 */
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 */
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;
+/* -----------------------------------------------------------> */
/*
==========================================================
*/
/**
-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
-*/
-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;
+ * Index structure of the JP2 file
+ * FIXME
+ */
+typedef struct opj_jp2_index {
+ /** */
+ OPJ_INT32 not_used;
+} opj_jp2_index_t;
#ifdef __cplusplus
*/
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);
/*
*/
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.
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);
-
+/* -----------> */
/*
==========================================================
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);
/**
* 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);
/**
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
projects / openjpeg.git / commitdiff