* 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.
*
opj_j2k_v2_t *p_j2k
);
+/**
+ * Reads the tiles.
+ */
+opj_bool j2k_decode_tiles ( opj_j2k_v2_t *p_j2k,
+ opj_stream_private_t *p_stream,
+ opj_event_mgr_t * p_manager);
+
+static opj_bool j2k_update_image_data (opj_tcd_v2_t * p_tcd, OPJ_BYTE * p_data);
+
+
/*
* -----------------------------------------------------------------------
* -----------------------------------------------------------------------
@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.
*
*/
static opj_bool j2k_read_unk_v2 ( opj_j2k_v2_t *p_j2k,
struct opj_stream_private *p_stream,
+ OPJ_UINT32 *output_marker,
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_t* p_image);
+
+
+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);
+
/*@}*/
/*@}*/
{J2K_MS_SOP, 0, 0},
{J2K_MS_CRG, J2K_STATE_MH, j2k_read_crg_v2},
{J2K_MS_COM, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_com_v2},
- {J2K_MS_UNK, J2K_STATE_MH | J2K_STATE_TPH, 0}//j2k_read_unk_v2}
-#ifdef TODO_MS
+#ifdef TODO_MS /* FIXME */
{J2K_MS_MCT, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mct},
{J2K_MS_CBD, J2K_STATE_MH , j2k_read_cbd},
{J2K_MS_MCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mcc},
{J2K_MS_MCO, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_mco},
#endif
#ifdef USE_JPWL
- {J2K_MS_EPC, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_epc},
- {J2K_MS_EPB, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_epb},
- {J2K_MS_ESD, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_esd},
- {J2K_MS_RED, J2K_DEC_STATE_MH | J2K_DEC_STATE_TPH, j2k_read_red},
+#ifdef TODO_MS /* FIXME */
+ {J2K_MS_EPC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epc},
+ {J2K_MS_EPB, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_epb},
+ {J2K_MS_ESD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_esd},
+ {J2K_MS_RED, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_red},
+#endif
#endif /* USE_JPWL */
#ifdef USE_JPSEC
{J2K_MS_SEC, J2K_DEC_STATE_MH, j2k_read_sec},
{J2K_MS_INSEC, 0, j2k_read_insec}
#endif /* USE_JPSEC */
+ {J2K_MS_UNK, J2K_STATE_MH | J2K_STATE_TPH, 0}//j2k_read_unk_v2}
};
* @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;
}
OPJ_UINT32 l_remaining_size;
OPJ_UINT32 l_nb_tiles;
OPJ_UINT32 l_tmp;
- opj_image_header_t *l_image = 00;
+ opj_image_t *l_image = 00;
opj_cp_v2_t *l_cp = 00;
- opj_image_comp_header_t * l_img_comp = 00;
+ opj_image_comp_t * l_img_comp = 00;
opj_tcp_v2_t * l_current_tile_param = 00;
// preconditions
assert(p_manager != 00);
assert(p_header_data != 00);
- l_image = p_j2k->m_image_header;
+ l_image = p_j2k->m_image;
l_cp = &(p_j2k->m_cp);
// minimum size == 39 - 3 (= minimum component parameter)
}
#ifdef USE_JPWL
- if (p_j2k->m_cp->correct) {
+ if (l_cp->correct) {
/* if JPWL is on, we check whether TX errors have damaged
too much the SIZ parameters */
- if (!(image->x1 * image->y1)) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR,
+ if (!(l_image->x1 * l_image->y1)) {
+ opj_event_msg_v2(p_manager, EVT_ERROR,
"JPWL: bad image size (%d x %d)\n",
- image->x1, image->y1);
+ l_image->x1, l_image->y1);
if (!JPWL_ASSUME || JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
}
}
- if (image->numcomps != ((len - 38) / 3)) {
- opj_event_msg(p_j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+
+ /* FIXME check previously in the function so why keep this piece of code ? Need by the norm ?
+ if (l_image->numcomps != ((len - 38) / 3)) {
+ opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
"JPWL: Csiz is %d => space in SIZ only for %d comps.!!!\n",
- image->numcomps, ((len - 38) / 3));
+ l_image->numcomps, ((len - 38) / 3));
if (!JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
}
- /* we try to correct */
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- trying to adjust this\n");
- if (image->numcomps < ((len - 38) / 3)) {
- len = 38 + 3 * image->numcomps;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- setting Lsiz to %d => HYPOTHESIS!!!\n",
+ */ /* we try to correct */
+ /* opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust this\n");
+ if (l_image->numcomps < ((len - 38) / 3)) {
+ len = 38 + 3 * l_image->numcomps;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- setting Lsiz to %d => HYPOTHESIS!!!\n",
len);
} else {
- image->numcomps = ((len - 38) / 3);
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- setting Csiz to %d => HYPOTHESIS!!!\n",
- image->numcomps);
+ l_image->numcomps = ((len - 38) / 3);
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- setting Csiz to %d => HYPOTHESIS!!!\n",
+ l_image->numcomps);
}
}
+ */
/* update components number in the jpwl_exp_comps filed */
- cp->exp_comps = image->numcomps;
+ l_cp->exp_comps = l_image->numcomps;
}
#endif /* USE_JPWL */
// Allocate the resulting image components
- l_image->comps = (opj_image_comp_header_t*) opj_calloc(l_image->numcomps, sizeof(opj_image_comp_header_t));
+ l_image->comps = (opj_image_comp_t*) opj_calloc(l_image->numcomps, sizeof(opj_image_comp_t));
if (l_image->comps == 00){
l_image->numcomps = 0;
opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to take in charge SIZ marker\n");
return OPJ_FALSE;
}
- memset(l_image->comps,0,l_image->numcomps * sizeof(opj_image_comp_header_t));
+ memset(l_image->comps,0,l_image->numcomps * sizeof(opj_image_comp_t));
l_img_comp = l_image->comps;
// Read the component information
l_img_comp->dy = (OPJ_INT32)tmp; // should be between 1 and 255
#ifdef USE_JPWL
- if (p_j2k->m_cp->correct) {
+ if (l_cp->correct) {
/* if JPWL is on, we check whether TX errors have damaged
too much the SIZ parameters, again */
- if (!(image->comps[i].dx * image->comps[i].dy)) {
- opj_event_msg(p_j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+ if (!(l_image->comps[i].dx * l_image->comps[i].dy)) {
+ opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
"JPWL: bad XRsiz_%d/YRsiz_%d (%d x %d)\n",
- i, i, image->comps[i].dx, image->comps[i].dy);
+ i, i, l_image->comps[i].dx, l_image->comps[i].dy);
if (!JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
}
/* we try to correct */
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
- if (!image->comps[i].dx) {
- image->comps[i].dx = 1;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- setting XRsiz_%d to %d => HYPOTHESIS!!!\n",
- i, image->comps[i].dx);
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust them\n");
+ if (!l_image->comps[i].dx) {
+ l_image->comps[i].dx = 1;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- setting XRsiz_%d to %d => HYPOTHESIS!!!\n",
+ i, l_image->comps[i].dx);
}
- if (!image->comps[i].dy) {
- image->comps[i].dy = 1;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- setting YRsiz_%d to %d => HYPOTHESIS!!!\n",
- i, image->comps[i].dy);
+ if (!l_image->comps[i].dy) {
+ l_image->comps[i].dy = 1;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- setting YRsiz_%d to %d => HYPOTHESIS!!!\n",
+ i, l_image->comps[i].dy);
}
}
}
}
#ifdef USE_JPWL
- if (p_j2k->m_cp->correct) {
+ if (l_cp->correct) {
/* if JPWL is on, we check whether TX errors have damaged
too much the SIZ parameters */
- if ((cp->tw < 1) || (cp->th < 1) || (cp->tw > cp->max_tiles) || (cp->th > cp->max_tiles)) {
- opj_event_msg(p_j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+ if ((l_cp->tw < 1) || (l_cp->th < 1) || (l_cp->tw > l_cp->max_tiles) || (l_cp->th > l_cp->max_tiles)) {
+ opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
"JPWL: bad number of tiles (%d x %d)\n",
- cp->tw, cp->th);
+ l_cp->tw, l_cp->th);
if (!JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
}
/* we try to correct */
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- trying to adjust them\n");
- if (cp->tw < 1) {
- cp->tw= 1;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- setting %d tiles in x => HYPOTHESIS!!!\n",
- cp->tw);
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust them\n");
+ if (l_cp->tw < 1) {
+ l_cp->tw= 1;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- setting %d tiles in x => HYPOTHESIS!!!\n",
+ l_cp->tw);
}
- if (cp->tw > cp->max_tiles) {
- cp->tw= 1;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- too large x, increase expectance of %d\n"
+ if (l_cp->tw > l_cp->max_tiles) {
+ l_cp->tw= 1;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- too large x, increase expectance of %d\n"
"- setting %d tiles in x => HYPOTHESIS!!!\n",
- cp->max_tiles, cp->tw);
+ l_cp->max_tiles, l_cp->tw);
}
- if (cp->th < 1) {
- cp->th= 1;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- setting %d tiles in y => HYPOTHESIS!!!\n",
- cp->th);
+ if (l_cp->th < 1) {
+ l_cp->th= 1;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- setting %d tiles in y => HYPOTHESIS!!!\n",
+ l_cp->th);
}
- if (cp->th > cp->max_tiles) {
- cp->th= 1;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- too large y, increase expectance of %d to continue\n",
+ if (l_cp->th > l_cp->max_tiles) {
+ l_cp->th= 1;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- too large y, increase expectance of %d to continue\n",
"- setting %d tiles in y => HYPOTHESIS!!!\n",
- cp->max_tiles, cp->th);
+ l_cp->max_tiles, l_cp->th);
}
}
}
memset(l_cp->tcps,0,l_nb_tiles*sizeof(opj_tcp_t));
#ifdef USE_JPWL
- if (p_j2k->m_cp->correct) {
- if (!cp->tcps) {
- opj_event_msg(p_j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+ if (l_cp->correct) {
+ if (!l_cp->tcps) {
+ opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
"JPWL: could not alloc tcps field of cp\n");
if (!JPWL_ASSUME || JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
}
}
}
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;
}
OPJ_UINT32 l_tmp;
opj_cp_v2_t *l_cp = 00;
opj_tcp_v2_t *l_tcp = 00;
- opj_image_header_t *l_image = 00;
+ opj_image_t *l_image = 00;
/* preconditions */
assert(p_header_data != 00);
assert(p_j2k != 00);
assert(p_manager != 00);
- l_image = p_j2k->m_image_header;
+ l_image = p_j2k->m_image;
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;
}
{
opj_cp_v2_t *l_cp = NULL;
opj_tcp_v2_t *l_tcp = NULL;
- opj_image_header_t *l_image = NULL;
+ opj_image_t *l_image = NULL;
OPJ_UINT32 l_comp_room;
OPJ_UINT32 l_comp_no;
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;
- l_image = p_j2k->m_image_header;
+ l_image = p_j2k->m_image;
l_comp_room = l_image->numcomps <= 256 ? 1 : 2;
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);
- l_num_comp = p_j2k->m_image_header->numcomps;
-
-#ifdef USE_JPWL
- if (p_j2k->m_cp->correct) {
-
- static OPJ_UINT32 backup_compno = 0;
-
- /* compno is negative or larger than the number of components!!! */
- if ((compno < 0) || (compno >= numcomp)) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR,
- "JPWL: bad component number in QCC (%d out of a maximum of %d)\n",
- compno, numcomp);
- if (!JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
- }
- /* we try to correct */
- compno = backup_compno % numcomp;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
- "- setting component number to %d\n",
- compno);
- }
-
- /* keep your private count of tiles */
- backup_compno++;
- };
-#endif /* USE_JPWL */
+ l_num_comp = p_j2k->m_image->numcomps;
if (l_num_comp <= 256) {
if (p_header_size < 1) {
p_header_size-=2;
}
+#ifdef USE_JPWL
+ if (p_j2k->m_cp.correct) {
+
+ static OPJ_UINT32 backup_compno = 0;
+
+ /* compno is negative or larger than the number of components!!! */
+ if ((l_comp_no < 0) || (l_comp_no >= l_num_comp)) {
+ opj_event_msg_v2(p_manager, EVT_ERROR,
+ "JPWL: bad component number in QCC (%d out of a maximum of %d)\n",
+ l_comp_no, l_num_comp);
+ if (!JPWL_ASSUME) {
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
+ }
+ /* we try to correct */
+ l_comp_no = backup_compno % l_num_comp;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust this\n"
+ "- setting component number to %d\n",
+ l_comp_no);
+ }
+
+ /* keep your private count of tiles */
+ backup_compno++;
+ };
+#endif /* USE_JPWL */
+
if (! j2k_read_SQcd_SQcc(p_j2k,l_comp_no,p_header_data,&p_header_size,p_manager)) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading QCC marker\n");
return OPJ_FALSE;
struct opj_event_mgr * p_manager)
{
OPJ_UINT32 i, l_nb_comp, l_tmp;
- opj_image_header_t * l_image = 00;
+ opj_image_t * l_image = 00;
OPJ_UINT32 l_old_poc_nb, l_current_poc_nb, l_current_poc_remaining;
OPJ_UINT32 l_chunk_size, l_comp_room;
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_image = p_j2k->m_image_header;
+ l_image = p_j2k->m_image;
l_nb_comp = l_image->numcomps;
if (l_nb_comp <= 256) {
l_comp_room = 1;
}
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;
assert(p_j2k != 00);
assert(p_manager != 00);
- l_nb_comp = p_j2k->m_image_header->numcomps;
+ l_nb_comp = p_j2k->m_image->numcomps;
if (p_header_size != l_nb_comp *4) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading CRG marker\n");
* @param p_header_size the size of the data contained in the PPT marker.
* @param p_manager the user event manager.
*/
-opj_bool j2k_read_ppt_v2 (
- opj_j2k_v2_t *p_j2k,
- OPJ_BYTE * p_header_data,
- OPJ_UINT32 p_header_size,
- struct opj_event_mgr * p_manager
- )
+opj_bool j2k_read_ppt_v2 ( opj_j2k_v2_t *p_j2k,
+ OPJ_BYTE * p_header_data,
+ OPJ_UINT32 p_header_size,
+ struct opj_event_mgr * p_manager )
{
-
opj_cp_v2_t *l_cp = 00;
opj_tcp_v2_t *l_tcp = 00;
OPJ_UINT32 l_Z_ppt;
- // preconditions
+ /* preconditions */
assert(p_header_data != 00);
assert(p_j2k != 00);
assert(p_manager != 00);
+ /* We need to have the Z_ppt element at minimum */
if (p_header_size < 1) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PPT marker\n");
return OPJ_FALSE;
}
l_cp = &(p_j2k->m_cp);
+ if (l_cp->ppm){
+ opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading PPT marker: packet header have been previously found in the main header (PPM marker).\n");
+ return OPJ_FALSE;
+ }
+
l_tcp = &(l_cp->tcps[p_j2k->m_current_tile_number]);
l_tcp->ppt = 1;
++p_header_data;
--p_header_size;
- // first PPT marker
+ /* Allocate buffer to read the packet header */
if (l_Z_ppt == 0) {
/* First PPT marker */
- l_tcp->ppt_len = p_header_size;
l_tcp->ppt_data_size = 0;
- l_tcp->ppt_buffer = (OPJ_BYTE *) opj_malloc(l_tcp->ppt_len);
- l_tcp->ppt_data = l_tcp->ppt_buffer;
+ l_tcp->ppt_len = p_header_size;
+ l_tcp->ppt_buffer = (OPJ_BYTE *) opj_calloc(l_tcp->ppt_len, sizeof(OPJ_BYTE) );
if (l_tcp->ppt_buffer == 00) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory reading PPT marker\n");
return OPJ_FALSE;
}
- memset(l_tcp->ppt_buffer,0,l_tcp->ppt_len);
+ l_tcp->ppt_data = l_tcp->ppt_buffer;
+
+ /* memset(l_tcp->ppt_buffer,0,l_tcp->ppt_len); */
}
else {
l_tcp->ppt_len += p_header_size;
- l_tcp->ppt_buffer = (OPJ_BYTE *) opj_realloc(l_tcp->ppt_buffer,l_tcp->ppt_len);
+ l_tcp->ppt_buffer = (OPJ_BYTE *) opj_realloc(l_tcp->ppt_buffer,l_tcp->ppt_len);
if (l_tcp->ppt_buffer == 00) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory reading PPT marker\n");
return OPJ_FALSE;
}
-
l_tcp->ppt_data = l_tcp->ppt_buffer;
+
memset(l_tcp->ppt_buffer+l_tcp->ppt_data_size,0,p_header_size);
}
+
+ /* Read packet header from buffer */
memcpy(l_tcp->ppt_buffer+l_tcp->ppt_data_size,p_header_data,p_header_size);
l_tcp->ppt_data_size += p_header_size;
+
return OPJ_TRUE;
}
OPJ_UINT32 l_current_part;
OPJ_UINT32 l_tile_x,l_tile_y;
- // preconditions
+ /* preconditions */
assert(p_header_data != 00);
assert(p_j2k != 00);
assert(p_manager != 00);
+ /* Size of this marker is fixed = 12 (we have already read marker and its size)*/
if (p_header_size != 8) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Error reading SOT marker\n");
return OPJ_FALSE;
l_tile_y = p_j2k->m_current_tile_number / l_cp->tw;
#ifdef USE_JPWL
- if (p_j2k->m_cp->correct) {
+ if (l_cp->correct) {
+ int tileno = p_j2k->m_current_tile_number;
static int backup_tileno = 0;
/* tileno is negative or larger than the number of tiles!!! */
- if ((tileno < 0) || (tileno > (cp->tw * cp->th))) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR,
+ if ((tileno < 0) || (tileno > (l_cp->tw * l_cp->th))) {
+ opj_event_msg_v2(p_manager, EVT_ERROR,
"JPWL: bad tile number (%d out of a maximum of %d)\n",
- tileno, (cp->tw * cp->th));
+ tileno, (l_cp->tw * l_cp->th));
if (!JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
}
/* we try to correct */
tileno = backup_tileno;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust this\n"
"- setting tile number to %d\n",
tileno);
}
p_header_data+=4;
#ifdef USE_JPWL
- if (p_j2k->m_cp->correct) {
+ if (l_cp->correct) {
/* totlen is negative or larger than the bytes left!!! */
- if ((totlen < 0) || (totlen > (p_stream_numbytesleft(p_stream) + 8))) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR,
+ if ((l_tot_len < 0) || (l_tot_len > p_header_size ) ) { /* FIXME it seems correct; for info in V1 -> (p_stream_numbytesleft(p_stream) + 8))) { */
+ opj_event_msg_v2(p_manager, EVT_ERROR,
"JPWL: bad tile byte size (%d bytes against %d bytes left)\n",
- totlen, p_stream_numbytesleft(p_stream) + 8);
+ l_tot_len, p_header_size ); /* FIXME it seems correct; for info in V1 -> p_stream_numbytesleft(p_stream) + 8); */
if (!JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
}
/* we try to correct */
- totlen = 0;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- trying to adjust this\n"
+ l_tot_len = 0;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust this\n"
"- setting Psot to %d => assuming it is the last tile\n",
- totlen);
+ l_tot_len);
}
-
};
#endif /* USE_JPWL */
+ /* Ref A.4.2: Psot could be equal zero if it is the last tile-part of the codestream.*/
if (!l_tot_len) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot read data with no size known, giving up\n");
+ opj_event_msg_v2(p_manager, EVT_ERROR, "Psot value of the current tile-part is equal to zero, "
+ "for the moment we couldn't manage this case (need to compute the number of byte left"
+ " in the codestream).\n");
return OPJ_FALSE;
}
opj_read_bytes(p_header_data,&l_num_parts ,1); /* TNsot */
++p_header_data;
- if (l_num_parts != 0) {
+ if (l_num_parts != 0) { /* Number of tile-part header is provided by this tile-part header */
+ /* Useful to manage the case of textGBR.jp2 file because two values of TNSot are allowed: the correct numbers of
+ * tile-parts for that tile and zero (A.4.2 of 15444-1 : 2002). */
+ if (l_tcp->m_nb_tile_parts) {
+ if (l_current_part >= l_tcp->m_nb_tile_parts){
+ opj_event_msg_v2(p_manager, EVT_ERROR, "In SOT marker, TPSot (%d) is not valid regards to the current "
+ "number of tile-part (%d), giving up\n", l_current_part, l_tcp->m_nb_tile_parts );
+ p_j2k->m_specific_param.m_decoder.m_last_tile_part = 1;
+ return OPJ_FALSE;
+ }
+ }
l_tcp->m_nb_tile_parts = l_num_parts;
}
+ /* If know the number of tile part header we will check if we didn't read the last*/
if (l_tcp->m_nb_tile_parts) {
if (l_tcp->m_nb_tile_parts == (l_current_part + 1)) {
- p_j2k->m_specific_param.m_decoder.m_can_decode = 1;
+ p_j2k->m_specific_param.m_decoder.m_can_decode = 1; /* Process the last tile-part header*/
}
}
- p_j2k->m_specific_param.m_decoder.m_sot_length = l_tot_len - 12; // SOT_marker_size = 12
- p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPH;// FIXME J2K_DEC_STATE_TPH;
+ if (!p_j2k->m_specific_param.m_decoder.m_last_tile_part){
+ /* Keep the size of data to skip after this marker */
+ p_j2k->m_specific_param.m_decoder.m_sot_length = l_tot_len - 12; /* SOT_marker_size = 12 */
+ }
+ else {
+ /* FIXME: need to be computed from the number of bytes remaining in the codestream */
+ p_j2k->m_specific_param.m_decoder.m_sot_length = 0;
+ }
+
+ p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPH;
+
+ /* Check if the current tile is outside the area we want decode (in tile index)*/
p_j2k->m_specific_param.m_decoder.m_skip_data =
(l_tile_x < p_j2k->m_specific_param.m_decoder.m_start_tile_x)
|| (l_tile_x >= p_j2k->m_specific_param.m_decoder.m_end_tile_x)
/* 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;
+#ifdef TODO_MSD /* FIXME */
+ l_cstr_index = p_j2k->cstr_index;
+
/* Index */
- 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;
-
- 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_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;
- 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,
p_manager);
if (l_current_read_size != p_j2k->m_specific_param.m_decoder.m_sot_length) {
- p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_NEOC; // FIXME J2K_DEC_STATE_NEOC;
+ p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_NEOC;
}
else {
- p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT; // FIXME J2K_DEC_STATE_TPHSOT;
+ p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT;
}
*l_tile_len += l_current_read_size;
)
{
OPJ_UINT32 l_nb_comp;
- opj_image_header_t * l_image = 00;
+ opj_image_t * l_image = 00;
opj_cp_v2_t *l_cp = 00;
opj_tcp_v2_t *l_tcp = 00;
assert(p_j2k != 00);
assert(p_manager != 00);
- l_image = p_j2k->m_image_header;
+ l_image = p_j2k->m_image;
l_nb_comp = l_image->numcomps;
if (l_nb_comp <= 256) {
}
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;
++p_header_data;
#ifdef USE_JPWL
- if (p_j2k->m_cp->correct) {
+ if (l_cp->correct) {
/* totlen is negative or larger than the bytes left!!! */
- if (compno >= numcomps) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR,
+ if (l_comp_room >= l_nb_comp) {
+ opj_event_msg_v2(p_manager, EVT_ERROR,
"JPWL: bad component number in RGN (%d when there are only %d)\n",
- compno, numcomps);
+ l_comp_room, l_nb_comp);
if (!JPWL_ASSUME || JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
}
}
};
* @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;
}
}
*/
opj_bool j2k_read_unk_v2 ( opj_j2k_v2_t *p_j2k,
struct opj_stream_private *p_stream,
+ OPJ_UINT32 *output_marker,
struct opj_event_mgr * p_manager
)
{
- OPJ_BYTE l_data [2];
- OPJ_UINT32 l_unknown_size, l_unknown_marker;
- const opj_dec_memory_marker_handler_t * l_marker_handler = 00;
+ OPJ_UINT32 l_unknown_marker;
+ const opj_dec_memory_marker_handler_t * l_marker_handler;
+ OPJ_UINT32 l_size_unk = 2;
// preconditions
assert(p_j2k != 00);
opj_event_msg_v2(p_manager, EVT_WARNING, "Unknown marker\n");
-
-
-/* if (opj_stream_read_data(p_stream,l_data,2,p_manager) != 2) {
- opj_event_msg_v2(p_manager, EVT_WARNING, "Unknown marker\n");
- return OPJ_FALSE;
- }
-
- opj_read_bytes(l_data,&l_unknown_size,2);
- if (l_unknown_size < 2) {
- return OPJ_FALSE;
- }
- l_unknown_size-=2;
-
- if (opj_stream_skip(p_stream,l_unknown_size,p_manager) != l_unknown_size) {
- return OPJ_FALSE;
- }*/
while(1) {
// 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) {
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*/
+ if (l_marker_handler->id != J2K_MS_SOT)
+ 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;
}
}
}
+ *output_marker = l_marker_handler->id ;
+
return OPJ_TRUE;
}
}
}
-void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters) {
+void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters)
+{
if(j2k && parameters) {
- /* create and initialize the coding parameters structure */
- //opj_cp_v2_t *cp = (opj_cp_v2_t*) opj_calloc(1, sizeof(opj_cp_v2_t));
j2k->m_cp.m_specific_param.m_dec.m_layer = parameters->cp_layer;
j2k->m_cp.m_specific_param.m_dec.m_reduce = parameters->cp_reduce;
- /*cp->reduce = parameters->cp_reduce;
- cp->layer = parameters->cp_layer;
- cp->limit_decoding = parameters->cp_limit_decoding;*/
-
- // TODO MS
#ifdef USE_JPWL
- cp->correct = parameters->jpwl_correct;
- cp->exp_comps = parameters->jpwl_exp_comps;
- cp->max_tiles = parameters->jpwl_max_tiles;
+ j2k->m_cp.correct = parameters->jpwl_correct;
+ j2k->m_cp.exp_comps = parameters->jpwl_exp_comps;
+ j2k->m_cp.max_tiles = parameters->jpwl_max_tiles;
#endif /* USE_JPWL */
-
}
}
}
+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 *sizeof(opj_marker_info_t));
+ }
+
+ /* add the marker */
+ cstr_index->marker[cstr_index->marknum].type = (OPJ_UINT16)type;
+ cstr_index->marker[cstr_index->marknum].pos = (OPJ_INT32)pos;
+ cstr_index->marker[cstr_index->marknum].len = (OPJ_INT32)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_t* p_image,
struct opj_event_mgr* p_manager )
{
/* preconditions */
assert(p_j2k != 00);
assert(p_stream != 00);
+ assert(p_image != 00);
assert(p_manager != 00);
/* create an empty image header */
- p_j2k->m_image_header = opj_image_header_create0();
- if (! p_j2k->m_image_header) {
+ p_j2k->m_image = opj_image_create0();
+ if (! p_j2k->m_image) {
return OPJ_FALSE;
}
/* validation of the parameters codec */
if (! j2k_exec(p_j2k, p_j2k->m_validation_list, p_stream,p_manager)) {
- opj_image_header_destroy(p_j2k->m_image_header);
- p_j2k->m_image_header = NULL;
+ opj_image_destroy(p_j2k->m_image);
+ p_j2k->m_image = NULL;
return OPJ_FALSE;
}
/* read header */
if (! j2k_exec (p_j2k,p_j2k->m_procedure_list,p_stream,p_manager)) {
- opj_image_header_destroy(p_j2k->m_image_header);
- p_j2k->m_image_header = NULL;
+ opj_image_destroy(p_j2k->m_image);
+ p_j2k->m_image = NULL;
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_image)){
+ opj_image_destroy(p_j2k->m_image);
+ p_j2k->m_image = 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_t* p_image)
{
- 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;
- }
+ OPJ_UINT16 compno;
+
+ /* preconditions */
+ assert(p_j2k != 00);
+ assert(p_image != 00);
+
+ p_image->x0 = p_j2k->m_image->x0;
+ p_image->y0 = p_j2k->m_image->y0;
+ p_image->x1 = p_j2k->m_image->x1;
+ p_image->y1 = p_j2k->m_image->y1;
- memcpy(img_info->comps, l_image_header->comps, img_info->numcomps * sizeof(opj_image_comp_header_t) );
+ p_image->numcomps = p_j2k->m_image->numcomps;
+ p_image->comps = (opj_image_comp_t*)opj_malloc(p_image->numcomps * sizeof(opj_image_comp_t));
+ if (!p_image->comps)
+ return OPJ_FALSE;
+ for (compno=0; compno < p_image->numcomps; compno++){
+ memcpy( &(p_image->comps[compno]),
+ &(p_j2k->m_image->comps[compno]),
+ sizeof(opj_image_comp_t));
}
+ p_image->color_space = p_j2k->m_image->color_space;
+ p_image->icc_profile_len = p_j2k->m_image->icc_profile_len;
+ if (!p_image->icc_profile_len) {
- 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");
+ p_image->icc_profile_buf = (unsigned char*)opj_malloc(p_image->icc_profile_len);
+ if (!p_image->icc_profile_buf)
return OPJ_FALSE;
- }
-
- memcpy(img_info->icc_profile_buf, l_image_header->icc_profile_buf, img_info->icc_profile_len);
- }
-
- return OPJ_TRUE;
-}
-
-/**
- * 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;
-
- nb_tiles = p_j2k->m_cp.tw * p_j2k->m_cp.th;
- nb_comps = l_image_header->numcomps;
-
- 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");
- return OPJ_FALSE;
- }
-
- 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;
- }
+ memcpy( p_image->icc_profile_buf,
+ p_j2k->m_image->icc_profile_buf,
+ p_j2k->m_image->icc_profile_len);
}
+ else
+ p_image->icc_profile_buf = NULL;
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
+ /* Try to read until the SOT is detected */
while (l_current_marker != J2K_MS_SOT) {
- // Check if the current marker ID is valid
+ /* Check if the current marker ID is valid */
if (l_current_marker < 0xff00) {
opj_event_msg_v2(p_manager, EVT_ERROR, "We expected read a marker ID (0xff--) instead of %.8x\n", l_current_marker);
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
- 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_event_msg_v2(p_manager, EVT_WARNING, "Unknown marker\n");
-
- // 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
- 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
- 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
- if ( !(l_current_marker < 0xff00) ) {
- // 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) ) {
- opj_event_msg_v2(p_manager, EVT_ERROR, "Marker is not compliant with its position\n");
- return OPJ_FALSE;
- }
- else{
- if (l_marker_handler->id != J2K_MS_UNK)
- break; // next marker is known and well located
- }
- }
+ if (! j2k_read_unk_v2(p_j2k, p_stream, &l_current_marker, p_manager)){
+ opj_event_msg_v2(p_manager, EVT_ERROR, "Unknow marker have been detected and generated error.\n");
+ return OPJ_FALSE;
}
+
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 */
+ else /* 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 */
+ 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;
}
- // 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_tccp_t *l_current_tccp = 00;
OPJ_UINT32 l_tccp_size;
OPJ_UINT32 l_mct_size;
- opj_image_header_t * l_image;
+ opj_image_t * l_image;
OPJ_UINT32 l_mcc_records_size,l_mct_records_size;
opj_mct_data_t * l_src_mct_rec, *l_dest_mct_rec;
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_image = p_j2k->m_image;
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) {
+ /* keep the tile-compo coding parameters pointer of the current tile coding parameters*/
l_current_tccp = l_tcp->tccps;
- memcpy(l_tcp,l_default_tcp, sizeof(opj_tcp_v2_t));
+ /*Copy default coding parameters into the current tile coding parameters*/
+ memcpy(l_tcp, l_default_tcp, sizeof(opj_tcp_v2_t));
+ /* Initialize some values of the current tile coding parameters*/
l_tcp->ppt = 0;
l_tcp->ppt_data = 00;
+ /* Reconnect the tile-compo coding parameters pointer to the current tile coding parameters*/
l_tcp->tccps = l_current_tccp;
- if
- (l_default_tcp->m_mct_decoding_matrix)
- {
+
+ /* Get the mct_decoding_matrix of the dflt_tile_cp and copy them into the current tile cp*/
+ 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);
}
+
+ /* Get the mct_record of the dflt_tile_cp and copy them into the current tile cp*/
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);
+
+ /* Copy the mct record data from dflt_tile_cp to the current tile*/
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;
}
+
+ /* Get the mcc_record of the dflt_tile_cp and copy them into the current tile cp*/
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);
+
+ /* Copy the mcc record data from dflt_tile_cp to the current tile*/
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;
}
+
+ /* Copy all the dflt_tile_compo_cp to the current tile cp */
memcpy(l_current_tccp,l_default_tcp->tccps,l_tccp_size);
+
+ /* Move to next tile cp*/
++l_tcp;
}
+
+ /* Create the current tile decoder*/
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;
}
OPJ_UINT32 l_current_marker = J2K_MS_SOT;
OPJ_UINT32 l_marker_size;
const opj_dec_memory_marker_handler_t * l_marker_handler = 00;
- opj_tcp_v2_t * l_tcp = 00;
+ opj_tcp_v2_t * l_tcp = NULL;
OPJ_UINT32 l_nb_tiles;
/* preconditions */
assert(p_j2k != 00);
assert(p_manager != 00);
- if (p_j2k->m_specific_param.m_decoder.m_state == 0x0100){// FIXME J2K_DEC_STATE_EOC)
+ /* Reach the End Of Codestream ?*/
+ if (p_j2k->m_specific_param.m_decoder.m_state == J2K_STATE_EOC){
l_current_marker = J2K_MS_EOC;
}
- else if (p_j2k->m_specific_param.m_decoder.m_state != J2K_STATE_TPHSOT){ // FIXME J2K_DEC_STATE_TPHSOT)
+ /* We need to encounter a SOT marker (a new tile-part header) */
+ else if (p_j2k->m_specific_param.m_decoder.m_state != J2K_STATE_TPHSOT){
return OPJ_FALSE;
}
- while (! p_j2k->m_specific_param.m_decoder.m_can_decode && l_current_marker != J2K_MS_EOC) {
+ /* Read into the codestream until reach the EOC or ! can_decode ??? FIXME */
+ while ( (!p_j2k->m_specific_param.m_decoder.m_can_decode) && (l_current_marker != J2K_MS_EOC) ) {
+
+ /* Try to read until the Start Of Data is detected */
while (l_current_marker != J2K_MS_SOD) {
+ /* 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 from the buffer as the marker size */
opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_marker_size,2);
- if (p_j2k->m_specific_param.m_decoder.m_state & J2K_STATE_TPH){ // FIXME J2K_DEC_STATE_TPH)
+ /* Why this condition? FIXME */
+ if (p_j2k->m_specific_param.m_decoder.m_state & J2K_STATE_TPH){
p_j2k->m_specific_param.m_decoder.m_sot_length -= (l_marker_size + 2);
}
- l_marker_size -= 2;
+ l_marker_size -= 2; /* Subtract the size of the marker ID already read */
+ /* Get the marker handler from the marker ID */
l_marker_handler = j2k_get_marker_handler(l_current_marker);
- /* Check if the marker is known */
+ /* 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;
}
+/* FIXME manage case of unknown marker as in the main header ? */
+ /* 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);
if (p_j2k->m_specific_param.m_decoder.m_header_data == 00) {
return OPJ_FALSE;
}
-
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 */
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 */
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 is not compliant with its position\n");
+ opj_event_msg_v2(p_manager, EVT_ERROR, "Fail to read the current marker segment (%#x)\n", l_current_marker);
return OPJ_FALSE;
}
if (p_j2k->m_specific_param.m_decoder.m_skip_data) {
+ /* Skip the rest of the tile part header*/
if (opj_stream_skip(p_stream,p_j2k->m_specific_param.m_decoder.m_sot_length,p_manager) != p_j2k->m_specific_param.m_decoder.m_sot_length) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
return OPJ_FALSE;
}
- l_current_marker = J2K_MS_SOD;
+ l_current_marker = J2K_MS_SOD; /* Normally we reached a SOD */
}
else {
+ /* 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 from the buffer as the new marker ID */
opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
}
}
+ /* If we didn't skip data before, we need to read the SOD marker*/
if (! p_j2k->m_specific_param.m_decoder.m_skip_data) {
- if (! j2k_read_sod_v2(p_j2k,p_stream,p_manager)) {
+ /* Try to read the SOD marker and skip data ? FIXME */
+ if (! j2k_read_sod_v2(p_j2k, p_stream, p_manager)) {
return OPJ_FALSE;
}
+
+ if (! p_j2k->m_specific_param.m_decoder.m_can_decode){
+ /* 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 from buffer as the new marker ID */
+ opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
+ }
}
else {
+ /* Indicate we will try to read a new tile-part header*/
p_j2k->m_specific_param.m_decoder.m_skip_data = 0;
p_j2k->m_specific_param.m_decoder.m_can_decode = 0;
- p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT; // FIXME J2K_DEC_STATE_TPHSOT;
+ p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_TPHSOT;
+ /* 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 from buffer as the new marker ID */
opj_read_bytes(p_j2k->m_specific_param.m_decoder.m_header_data,&l_current_marker,2);
}
}
+ /* Current marker is the EOC marker ?*/
if (l_current_marker == J2K_MS_EOC) {
- if (p_j2k->m_specific_param.m_decoder.m_state != 0x0100 ){// FIXME J2K_DEC_STATE_EOC)
+ if (p_j2k->m_specific_param.m_decoder.m_state != J2K_STATE_EOC ){
p_j2k->m_current_tile_number = 0;
- p_j2k->m_specific_param.m_decoder.m_state = 0x0100;// FIXME J2K_DEC_STATE_EOC;
+ p_j2k->m_specific_param.m_decoder.m_state = J2K_STATE_EOC;
}
}
+ /* FIXME DOC ???*/
if ( ! p_j2k->m_specific_param.m_decoder.m_can_decode) {
l_tcp = p_j2k->m_cp.tcps + p_j2k->m_current_tile_number;
l_nb_tiles = p_j2k->m_cp.th * p_j2k->m_cp.tw;
}
}
+ /*FIXME ???*/
if (! tcd_init_decode_tile(p_j2k->m_tcd, p_j2k->m_current_tile_number)) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Cannot decode tile, memory error\n");
return OPJ_FALSE;
}
+ opj_event_msg_v2(p_manager, EVT_INFO, "Header of tile %d / %d has been read.\n",
+ p_j2k->m_current_tile_number +1, p_j2k->m_cp.th * p_j2k->m_cp.tw);
+
*p_tile_index = p_j2k->m_current_tile_number;
*p_go_on = OPJ_TRUE;
*p_data_size = tcd_get_decoded_tile_size(p_j2k->m_tcd);
*p_tile_x1 = p_j2k->m_tcd->tcd_image->tiles->x1;
*p_tile_y1 = p_j2k->m_tcd->tcd_image->tiles->y1;
*p_nb_comps = p_j2k->m_tcd->tcd_image->tiles->numcomps;
- p_j2k->m_specific_param.m_decoder.m_state |= 0x0080;// FIXME J2K_DEC_STATE_DATA;
+
+ p_j2k->m_specific_param.m_decoder.m_state |= 0x0080;// FIXME J2K_DEC_STATE_DATA;
return OPJ_TRUE;
}
-opj_bool j2k_decode_tile (
- opj_j2k_v2_t * p_j2k,
- OPJ_UINT32 p_tile_index,
- OPJ_BYTE * p_data,
- OPJ_UINT32 p_data_size,
- opj_stream_private_t *p_stream,
- opj_event_mgr_t * p_manager
- )
+opj_bool j2k_decode_tile ( opj_j2k_v2_t * p_j2k,
+ OPJ_UINT32 p_tile_index,
+ OPJ_BYTE * p_data,
+ OPJ_UINT32 p_data_size,
+ opj_stream_private_t *p_stream,
+ opj_event_mgr_t * p_manager )
{
OPJ_UINT32 l_current_marker;
OPJ_BYTE l_data [2];
opj_tcp_v2_t * l_tcp;
- // preconditions
+ /* preconditions */
assert(p_stream != 00);
assert(p_j2k != 00);
assert(p_manager != 00);
- if
- (! (p_j2k->m_specific_param.m_decoder.m_state & 0x0080/*FIXME J2K_DEC_STATE_DATA*/) || p_tile_index != p_j2k->m_current_tile_number)
- {
+ if ( !(p_j2k->m_specific_param.m_decoder.m_state & 0x0080/*FIXME J2K_DEC_STATE_DATA*/)
+ || (p_tile_index != p_j2k->m_current_tile_number) ) {
return OPJ_FALSE;
}
+
l_tcp = &(p_j2k->m_cp.tcps[p_tile_index]);
- if
- (! l_tcp->m_data)
- {
+ if (! l_tcp->m_data) {
j2k_tcp_destroy(&(p_j2k->m_cp.tcps[p_tile_index]));
return OPJ_FALSE;
}
- if
- (! tcd_decode_tile_v2(p_j2k->m_tcd, l_tcp->m_data, l_tcp->m_data_size, p_tile_index, p_j2k->cstr_info))
- {
+
+ if (! tcd_decode_tile_v2( p_j2k->m_tcd,
+ l_tcp->m_data,
+ l_tcp->m_data_size,
+ p_tile_index,
+ 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;
}
- if
- (! tcd_update_tile_data(p_j2k->m_tcd,p_data,p_data_size))
- {
+
+ if (! tcd_update_tile_data(p_j2k->m_tcd,p_data,p_data_size)) {
return OPJ_FALSE;
}
+
j2k_tcp_destroy(l_tcp);
p_j2k->m_tcd->tcp = 0;
p_j2k->m_specific_param.m_decoder.m_can_decode = 0;
p_j2k->m_specific_param.m_decoder.m_state &= (~ (0x0080));// FIXME J2K_DEC_STATE_DATA);
- if
- (p_j2k->m_specific_param.m_decoder.m_state != 0x0100)//FIXME J2K_DEC_STATE_EOC)
- {
- if
- (opj_stream_read_data(p_stream,l_data,2,p_manager) != 2)
- {
+
+ if (p_j2k->m_specific_param.m_decoder.m_state != 0x0100){ //FIXME J2K_DEC_STATE_EOC)
+ if (opj_stream_read_data(p_stream,l_data,2,p_manager) != 2) {
opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short\n");
return OPJ_FALSE;
}
+
opj_read_bytes(l_data,&l_current_marker,2);
- if
- (l_current_marker == J2K_MS_EOC)
- {
+
+ if (l_current_marker == J2K_MS_EOC) {
p_j2k->m_current_tile_number = 0;
p_j2k->m_specific_param.m_decoder.m_state = 0x0100;//FIXME J2K_DEC_STATE_EOC;
}
- else if
- (l_current_marker != J2K_MS_SOT)
+ else if (l_current_marker != J2K_MS_SOT)
{
opj_event_msg_v2(p_manager, EVT_ERROR, "Stream too short, expected SOT\n");
return OPJ_FALSE;
}
}
+
return OPJ_TRUE;
}
+opj_bool j2k_update_image_data (opj_tcd_v2_t * p_tcd, OPJ_BYTE * p_data)
+{
+ OPJ_UINT32 i,j,k = 0;
+ OPJ_UINT32 l_width,l_height,l_offset_x,l_offset_y;
+ opj_image_comp_t * l_img_comp = 00;
+ opj_tcd_tilecomp_v2_t * l_tilec = 00;
+ opj_image_t * l_image = 00;
+ OPJ_UINT32 l_size_comp, l_remaining;
+ OPJ_UINT32 l_dest_stride;
+ OPJ_INT32 * l_dest_ptr;
+ opj_tcd_resolution_v2_t* l_res= 00;
+
+
+ l_tilec = p_tcd->tcd_image->tiles->comps;
+ l_image = p_tcd->image;
+ l_img_comp = l_image->comps;
+
+ for (i=0;i<p_tcd->image->numcomps;++i) {
+
+ if (!l_img_comp->data) {
+
+ l_img_comp->data = (OPJ_INT32*) opj_malloc(l_img_comp->w * l_img_comp->h * sizeof(OPJ_INT32));
+ if (! l_img_comp->data) {
+ return OPJ_FALSE;
+ }
+ memset(l_img_comp->data,0,l_img_comp->w * l_img_comp->h * sizeof(OPJ_INT32));
+ }
+
+ l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/
+ l_remaining = l_img_comp->prec & 7; /* (%8) */
+ l_res = l_tilec->resolutions + l_img_comp->resno_decoded;
+
+ if (l_remaining) {
+ ++l_size_comp;
+ }
+
+ if (l_size_comp == 3) {
+ l_size_comp = 4;
+ }
+
+ l_width = (l_res->x1 - l_res->x0);
+ l_height = (l_res->y1 - l_res->y0);
+
+ l_dest_stride = (l_img_comp->w) - l_width;
+
+ l_offset_x = int_ceildivpow2(l_img_comp->x0, l_img_comp->factor);
+ l_offset_y = int_ceildivpow2(l_img_comp->y0, l_img_comp->factor);
+ l_dest_ptr = l_img_comp->data + (l_res->x0 - l_offset_x) + (l_res->y0 - l_offset_y) * l_img_comp->w;
+
+ switch (l_size_comp) {
+ case 1:
+ {
+ OPJ_CHAR * l_src_ptr = (OPJ_CHAR*) p_data;
+ if (l_img_comp->sgnd) {
+ for (j=0;j<l_height;++j) {
+ for (k=0;k<l_width;++k) {
+ *(l_dest_ptr++) = (OPJ_INT32) (*(l_src_ptr++));
+ }
+
+ l_dest_ptr += l_dest_stride;
+ }
+ }
+ else {
+ for (j=0;j<l_height;++j) {
+ for (k=0;k<l_width;++k) {
+ *(l_dest_ptr++) = (OPJ_INT32) ((*(l_src_ptr++))&0xff);
+ }
+
+ l_dest_ptr += l_dest_stride;
+ }
+ }
+
+ p_data = (OPJ_BYTE*) l_src_ptr;
+ }
+ break;
+ case 2:
+ {
+ OPJ_INT16 * l_src_ptr = (OPJ_INT16 *) p_data;
+
+ if (l_img_comp->sgnd) {
+ for (j=0;j<l_height;++j) {
+ for (k=0;k<l_width;++k) {
+ *(l_dest_ptr++) = *(l_src_ptr++);
+ }
+
+ l_dest_ptr += l_dest_stride;
+ }
+ }
+ else {
+ for (j=0;j<l_height;++j) {
+ for (k=0;k<l_width;++k) {
+ *(l_dest_ptr++) = (*(l_src_ptr++))&0xffff;
+ }
+
+ l_dest_ptr += l_dest_stride;
+ }
+ }
+
+ p_data = (OPJ_BYTE*) l_src_ptr;
+ }
+ break;
+ case 4:
+ {
+ OPJ_INT32 * l_src_ptr = (OPJ_INT32 *) p_data;
+ for (j=0;j<l_height;++j) {
+ for (k=0;k<l_width;++k) {
+ *(l_dest_ptr++) = (*(l_src_ptr++));
+ }
+
+ l_dest_ptr += l_dest_stride;
+ }
+
+ p_data = (OPJ_BYTE*) l_src_ptr;
+ }
+ break;
+ }
+
+ ++l_img_comp;
+ ++l_tilec;
+ }
+ return OPJ_TRUE;
+}
+
/**
* Sets the given area to be decoded. This function should be called right after opj_read_header and before any tile header reading.
*
/* Check if the positions provided by the user are correct */
/* Left */
- if (p_start_x > l_cp->tw * l_cp->tdx) {
+ if (p_start_x > l_cp->tx0 + l_cp->tw * l_cp->tdx) {
opj_event_msg_v2(p_manager, EVT_ERROR,
- "Left position of the decoded area (ROI_x0=%d) is outside the tile area (nb_tw x XTsiz=%d).\n",
- p_start_x, l_cp->tw * l_cp->tdx);
+ "Left position of the decoded area (ROI_x0=%d) is outside the tile area (XTOsiz + nb_tw x XTsiz=%d).\n",
+ p_start_x, l_cp->tx0 + l_cp->tw * l_cp->tdx);
return OPJ_FALSE;
}
else if (p_start_x < l_cp->tx0){
p_j2k->m_specific_param.m_decoder.m_start_tile_x = (p_start_x - l_cp->tx0) / l_cp->tdx;
/* Up */
- if (p_start_y > l_cp->th * l_cp->tdy){
+ if (p_start_y > l_cp->ty0 + l_cp->th * l_cp->tdy){
opj_event_msg_v2(p_manager, EVT_ERROR,
- "Up position of the decoded area (ROI_y0=%d) is outside the tile area (nb_th x YTsiz=%d).\n",
- p_start_y, l_cp->th * l_cp->tdy);
+ "Up position of the decoded area (ROI_y0=%d) is outside the tile area (YTOsiz + nb_th x YTsiz=%d).\n",
+ p_start_y, l_cp->ty0 + l_cp->th * l_cp->tdy);
return OPJ_FALSE;
}
else if (p_start_y < l_cp->ty0){
p_end_x, l_cp->tx0);
return OPJ_FALSE;
}
- else if (p_end_x > l_cp->tw * l_cp->tdx) {
+ else if (p_end_x > l_cp->tx0 + l_cp->tw * l_cp->tdx) {
opj_event_msg_v2(p_manager, EVT_WARNING,
- "Right position of the decoded area (ROI_x1=%d) is outside the tile area (nb_tw x XTsiz=%d).\n",
- p_end_x, l_cp->tw * l_cp->tdx);
+ "Right position of the decoded area (ROI_x1=%d) is outside the tile area (XTOsiz + nb_tw x XTsiz=%d).\n",
+ p_end_x, l_cp->tx0 + l_cp->tw * l_cp->tdx);
p_j2k->m_specific_param.m_decoder.m_end_tile_x = l_cp->tw; // FIXME (-1) ???
}
else
p_j2k->m_specific_param.m_decoder.m_end_tile_x = int_ceildiv((p_end_x - l_cp->tx0), l_cp->tdx);
/* Bottom */
- if (p_end_x < l_cp->ty0) {
+ if (p_end_y < l_cp->ty0) {
opj_event_msg_v2(p_manager, EVT_ERROR,
"Right position of the decoded area (ROI_y1=%d) is outside the tile area (YTOsiz=%d).\n",
- p_end_x, l_cp->ty0);
+ p_end_y, l_cp->ty0);
return OPJ_FALSE;
}
- if (p_end_y > l_cp->th * l_cp->tdy){
+ if (p_end_y > l_cp->ty0 + l_cp->th * l_cp->tdy){
opj_event_msg_v2(p_manager, EVT_WARNING,
- "Bottom position of the decoded area (ROI_y1=%d) is outside the tile area (nb_th x YTsiz=%d).\n",
- p_end_y, l_cp->th * l_cp->tdy);
+ "Bottom position of the decoded area (ROI_y1=%d) is outside the tile area (YTOsiz + nb_th x YTsiz=%d).\n",
+ p_end_y, l_cp->ty0 + l_cp->th * l_cp->tdy);
p_j2k->m_specific_param.m_decoder.m_start_tile_y = l_cp->th; // FIXME (-1) ???
}
else
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->marknum = 0;
+ 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;
/* precondition again */
- assert(compno < p_j2k->m_image_header->numcomps);
+ assert(compno < p_j2k->m_image->numcomps);
l_tccp = &l_tcp->tccps[compno];
l_current_ptr = p_header_data;
}
}
+#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;
}
l_copied_tccp = l_ref_tccp + 1;
l_prc_size = l_ref_tccp->numresolutions * sizeof(OPJ_UINT32);
- for (i=1; i<p_j2k->m_image_header->numcomps; ++i) {
+ for (i=1; i<p_j2k->m_image->numcomps; ++i) {
l_copied_tccp->numresolutions = l_ref_tccp->numresolutions;
l_copied_tccp->cblkw = l_ref_tccp->cblkw;
l_copied_tccp->cblkh = l_ref_tccp->cblkh;
p_j2k->m_specific_param.m_decoder.m_default_tcp;
// precondition again
- assert(p_comp_no < p_j2k->m_image_header->numcomps);
+ assert(p_comp_no < p_j2k->m_image->numcomps);
l_tccp = &l_tcp->tccps[p_comp_no];
l_current_ptr = p_header_data;
}
#ifdef USE_JPWL
- if (p_j2k->m_cp->correct) {
+ if (l_cp->correct) {
/* if JPWL is on, we check whether there are too many subbands */
- if ((numbands < 0) || (numbands >= J2K_MAXBANDS)) {
- opj_event_msg(p_j2k->cinfo, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
+ if ((l_num_band < 0) || (l_num_band >= J2K_MAXBANDS)) {
+ opj_event_msg_v2(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR,
"JPWL: bad number of subbands in Sqcx (%d)\n",
- numbands);
+ l_num_band);
if (!JPWL_ASSUME) {
- opj_event_msg(p_j2k->cinfo, EVT_ERROR, "JPWL: giving up\n");
- return;
+ opj_event_msg_v2(p_manager, EVT_ERROR, "JPWL: giving up\n");
+ return OPJ_FALSE;
}
/* we try to correct */
- numbands = 1;
- opj_event_msg(p_j2k->cinfo, EVT_WARNING, "- trying to adjust them\n"
+ l_num_band = 1;
+ opj_event_msg_v2(p_manager, EVT_WARNING, "- trying to adjust them\n"
"- setting number of bands to %d => HYPOTHESIS!!!\n",
- numbands);
+ l_num_band);
};
};
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);
- for (i=1;i<p_j2k->m_image_header->numcomps;++i) {
+ for (i=1;i<p_j2k->m_image->numcomps;++i) {
l_copied_tccp->qntsty = l_ref_tccp->qntsty;
l_copied_tccp->numgbits = l_ref_tccp->numgbits;
memcpy(l_copied_tccp->stepsizes,l_ref_tccp->stepsizes,l_size);
++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)
+ j2k_dump_image_header(p_j2k->m_image, 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->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_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_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->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->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;
+}
+
+
+
+/**
+ * Reads the tiles.
+ */
+opj_bool j2k_decode_tiles ( opj_j2k_v2_t *p_j2k,
+ opj_stream_private_t *p_stream,
+ opj_event_mgr_t * p_manager)
+{
+ opj_bool l_go_on = OPJ_TRUE;
+ OPJ_UINT32 l_current_tile_no;
+ OPJ_UINT32 l_data_size,l_max_data_size;
+ OPJ_INT32 l_tile_x0,l_tile_y0,l_tile_x1,l_tile_y1;
+ OPJ_UINT32 l_nb_comps;
+ OPJ_BYTE * l_current_data;
+
+ l_current_data = (OPJ_BYTE*)opj_malloc(1000);
+ if (! l_current_data) {
+ return OPJ_FALSE;
+ }
+ l_max_data_size = 1000;
+
+ while (OPJ_TRUE) {
+ if (! j2k_read_tile_header( p_j2k,
+ &l_current_tile_no,
+ &l_data_size,
+ &l_tile_x0, &l_tile_y0,
+ &l_tile_x1, &l_tile_y1,
+ &l_nb_comps,
+ &l_go_on,
+ p_stream,
+ p_manager)) {
+ return OPJ_FALSE;
+ }
+
+ if (! l_go_on) {
+ break;
+ }
+
+ if (l_data_size > l_max_data_size) {
+ l_current_data = (OPJ_BYTE*)opj_realloc(l_current_data,l_data_size);
+ if (! l_current_data) {
+ return OPJ_FALSE;
+ }
+
+ l_max_data_size = l_data_size;
+ }
+
+ if (! j2k_decode_tile(p_j2k,l_current_tile_no,l_current_data,l_data_size,p_stream,p_manager)) {
+ opj_free(l_current_data);
+ return OPJ_FALSE;
+ }
+ opj_event_msg_v2(p_manager, EVT_INFO, "Tile %d/%d has been decode.\n", l_current_tile_no +1, p_j2k->m_cp.th * p_j2k->m_cp.tw);
+
+ if (! j2k_update_image_data(p_j2k->m_tcd,l_current_data)) {
+ opj_free(l_current_data);
+ return OPJ_FALSE;
+ }
+ opj_event_msg_v2(p_manager, EVT_INFO, "Image data has been updated with tile %d.\n\n", l_current_tile_no + 1);
+
+ }
+
+ opj_free(l_current_data);
+ return OPJ_TRUE;
+}
+
+
+/**
+ * Sets up the procedures to do on decoding data. Developpers wanting to extend the library can add their own reading procedures.
+ */
+void j2k_setup_decoding (opj_j2k_v2_t *p_j2k)
+{
+ // preconditions
+ assert(p_j2k != 00);
+
+ opj_procedure_list_add_procedure(p_j2k->m_procedure_list,(void*)j2k_decode_tiles);
+ /* DEVELOPER CORNER, add your custom procedures */
+
+}
+
+
+/**
+ * Decodes the tiles of the stream.
+ */
+opj_bool j2k_decode_v2( opj_j2k_v2_t * p_j2k,
+ opj_stream_private_t * p_stream,
+ opj_image_t * p_image,
+ opj_event_mgr_t * p_manager)
+{
+ OPJ_UINT32 compno;
+
+ /* customization of the decoding */
+ j2k_setup_decoding(p_j2k);
+
+ /* write header */
+ if (! j2k_exec (p_j2k,p_j2k->m_procedure_list,p_stream,p_manager)) {
+ opj_image_destroy(p_j2k->m_image);
+ p_j2k->m_image = NULL;
+ return OPJ_FALSE;
+ }
+
+ for (compno = 0; compno < p_image->numcomps; compno++) {
+ p_image->comps[compno].data = p_j2k->m_image->comps[compno].data;
+ p_j2k->m_image->comps[compno].data = NULL;
+ }
+
+ return OPJ_TRUE /*p_j2k->m_image*/;
+}