cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length);\r
\r
/* decode the stream and fill the image structure */\r
- opjimage = opj_decode(dinfo, cio, &cstr_info);\r
+ opjimage = opj_decode_with_info(dinfo, cio, &cstr_info);\r
if (!opjimage) {\r
#ifndef __WXGTK__ \r
wxMutexGuiEnter();\r
parameters.cp_cinema = OFF;\r
\r
/* subsampling */\r
- if (sscanf(m_subsampling.c_str(), wxT("%d,%d"), &(parameters.subsampling_dx), &(parameters.subsampling_dy)) != 2) {\r
+ if (sscanf(m_subsampling.ToAscii(), "%d,%d", &(parameters.subsampling_dx), &(parameters.subsampling_dy)) != 2) {\r
wxLogError(wxT("Wrong sub-sampling encoder setting: dx,dy"));\r
return false;\r
}\r
\r
/* compression rates */\r
if (m_rates != wxT("")) {\r
- char *s1 = (char *) m_rates.c_str();\r
- wxLogMessage("rates %s", s1);\r
+ const char *s1 = m_rates.ToAscii();\r
+ wxLogMessage(wxT("rates %s"), s1);\r
while (sscanf(s1, "%f", &(parameters.tcp_rates[parameters.tcp_numlayers])) == 1) {\r
parameters.tcp_numlayers++;\r
while (*s1 && *s1 != ',') {\r
break;\r
s1++;\r
}\r
- wxLogMessage("%d layers", parameters.tcp_numlayers);\r
+ wxLogMessage(wxT("%d layers"), parameters.tcp_numlayers);\r
parameters.cp_disto_alloc = 1;\r
}\r
\r
/* image quality, dB */\r
if (m_rates == wxT("")) {\r
- char *s2 = (char *) m_quality.c_str();\r
- wxLogMessage("qualities %s", s2);\r
+ const char *s2 = m_quality.ToAscii();\r
+ wxLogMessage(wxT("qualities %s"), s2);\r
while (sscanf(s2, "%f", ¶meters.tcp_distoratio[parameters.tcp_numlayers]) == 1) {\r
parameters.tcp_numlayers++;\r
while (*s2 && *s2 != ',') {\r
break;\r
s2++;\r
}\r
- wxLogMessage("%d layers", parameters.tcp_numlayers);\r
+ wxLogMessage(wxT("%d layers"), parameters.tcp_numlayers);\r
parameters.cp_fixed_quality = 1;\r
}\r
\r
/* image origin */\r
- if (sscanf(m_origin.c_str(), "%d,%d", ¶meters.image_offset_x0, ¶meters.image_offset_y0) != 2) {\r
+ if (sscanf(m_origin.ToAscii(), "%d,%d", ¶meters.image_offset_x0, ¶meters.image_offset_y0) != 2) {\r
wxLogError(wxT("bad coordinate of the image origin: x0,y0"));\r
return false;\r
}\r
\r
/* Create comment for codestream */\r
if(m_enablecomm) {\r
- parameters.cp_comment = (char *) malloc(strlen(m_comment.c_str()) + 1);\r
+ parameters.cp_comment = (char *) malloc(strlen(m_comment.ToAscii()) + 1);\r
if(parameters.cp_comment) {\r
- strcpy(parameters.cp_comment, m_comment.c_str());\r
+ strcpy(parameters.cp_comment, m_comment.ToAscii());\r
}\r
} else {\r
parameters.cp_comment = NULL;\r
\r
/* indexing file */\r
if (m_enableidx) {\r
- strncpy(indexfilename, m_index.c_str(), OPJ_PATH_LEN);\r
- wxLogMessage("index file is %s", indexfilename);\r
+ strncpy(indexfilename, m_index.ToAscii(), OPJ_PATH_LEN);\r
+ wxLogMessage(wxT("index file is %s"), indexfilename);\r
}\r
\r
/* if no rate entered, lossless by default */\r
/* codeblocks size */\r
if (m_cbsize != wxT("")) {\r
int cblockw_init = 0, cblockh_init = 0;\r
- sscanf(m_cbsize.c_str(), "%d,%d", &cblockw_init, &cblockh_init);\r
+ sscanf(m_cbsize.ToAscii(), "%d,%d", &cblockw_init, &cblockh_init);\r
if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024 || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {\r
- wxLogError("!! Size of code_block error !! Restrictions:\n width*height<=4096\n 4<=width,height<= 1024");\r
+ wxLogError(wxT("!! Size of code_block error !! Restrictions:\n width*height<=4096\n 4<=width,height<= 1024"));\r
return false;\r
}\r
parameters.cblockw_init = cblockw_init;\r
\r
/* tiles */\r
if (m_tsize != wxT("")) {\r
- sscanf(m_tsize.c_str(), "%d,%d", ¶meters.cp_tdx, ¶meters.cp_tdy);\r
+ sscanf(m_tsize.ToAscii(), "%d,%d", ¶meters.cp_tdx, ¶meters.cp_tdy);\r
parameters.tile_size_on = true;\r
}\r
\r
/* tile origin */\r
- if (sscanf(m_torigin.c_str(), "%d,%d", ¶meters.cp_tx0, ¶meters.cp_ty0) != 2) {\r
- wxLogError("tile offset setting error: X0,Y0");\r
+ if (sscanf(m_torigin.ToAscii(), "%d,%d", ¶meters.cp_tx0, ¶meters.cp_ty0) != 2) {\r
+ wxLogError(wxT("tile offset setting error: X0,Y0"));\r
return false;\r
}\r
\r
cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);\r
\r
/* encode the image */\r
- bSuccess = opj_encode(cinfo, cio, oimage, &cstr_info);\r
+ bSuccess = opj_encode_with_info(cinfo, cio, oimage, &cstr_info);\r
if (!bSuccess) {\r
\r
opj_cio_close(cio);\r
return hdr[0] == 0xFF && hdr[1] == 0x4F;\r
}\r
\r
-/**\r
-Create an index and write it to a file\r
-@param cstr_info Codestream information \r
-@param index Index filename\r
-@return Returns 0 if successful, returns 1 otherwise\r
-*/\r
+// write the index file\r
bool wxJ2KHandler::write_index_file(opj_codestream_info_t *cstr_info, char *index) {\r
int tileno, compno, layno, resno, precno, pack_nb, x, y;\r
FILE *stream = NULL;\r
+ double total_disto = 0;\r
int tilepartno;\r
\r
+#ifdef USE_JPWL\r
+ if (!strcmp(index, JPWL_PRIVATEINDEX_NAME))\r
+ return true;\r
+#endif // USE_JPWL\r
+\r
if (!cstr_info) \r
return 1;\r
\r
stream = fopen(index, "w");\r
if (!stream) {\r
fprintf(stderr, "failed to open index file [%s] for writing\n", index);\r
- return 1;\r
+ return false;\r
}\r
\r
fprintf(stream, "%d %d\n", cstr_info->image_w, cstr_info->image_h);\r
fprintf(stream, "%d\n", cstr_info->numcomps);\r
fprintf(stream, "%d\n", cstr_info->numlayers);\r
fprintf(stream, "%d\n", cstr_info->numdecompos);\r
- \r
- for (resno = cstr_info->numdecompos; resno >= 0; resno--) {\r
+\r
+ for (resno = cstr_info->numdecompos[0]; resno >= 0; resno--) {\r
fprintf(stream, "[%d,%d] ", \r
- (1 << cstr_info->tile[0].pdx[resno]), (1 << cstr_info->tile[0].pdx[resno])); /* based on tile 0 */\r
+ (1 << cstr_info->tile[0].pdx[resno]), (1 << cstr_info->tile[0].pdx[resno])); /* based on tile 0 and component 0 */\r
}\r
+\r
fprintf(stream, "\n");\r
fprintf(stream, "%d\n", cstr_info->main_head_start);\r
fprintf(stream, "%d\n", cstr_info->main_head_end);\r
fprintf(stream, "%d\n", cstr_info->codestream_size);\r
\r
fprintf(stream, "\nINFO ON TILES\n");\r
- fprintf(stream, "tileno start_pos end_hd end_tile nbparts\n");\r
+ fprintf(stream, "tileno start_pos end_hd end_tile nbparts disto nbpix disto/nbpix\n");\r
for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {\r
- fprintf(stream, "%4d %9d %9d %9d %9d\n",\r
+ fprintf(stream, "%4d %9d %9d %9d %9d %9e %9d %9e\n",\r
cstr_info->tile[tileno].tileno,\r
cstr_info->tile[tileno].start_pos,\r
cstr_info->tile[tileno].end_header,\r
cstr_info->tile[tileno].end_pos,\r
- cstr_info->tile[tileno].num_tps);\r
+ cstr_info->tile[tileno].num_tps,\r
+ cstr_info->tile[tileno].distotile, cstr_info->tile[tileno].numpix,\r
+ cstr_info->tile[tileno].distotile / cstr_info->tile[tileno].numpix);\r
}\r
\r
for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {\r
int start_pos, end_ph_pos, end_pos;\r
+ double disto = 0;\r
+ int max_numdecompos = 0;\r
pack_nb = 0;\r
\r
+ for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
+ if (max_numdecompos < cstr_info->numdecompos[compno])\r
+ max_numdecompos = cstr_info->numdecompos[compno];\r
+ } \r
+\r
fprintf(stream, "\nTILE %d DETAILS\n", tileno); \r
- fprintf(stream, "part_nb tileno num_packs start_pos end_tph_pos end_pos\n");\r
+ fprintf(stream, "part_nb tileno start_pack num_packs start_pos end_tph_pos end_pos\n");\r
for (tilepartno = 0; tilepartno < cstr_info->tile[tileno].num_tps; tilepartno++)\r
- fprintf(stream, "%4d %9d %9d %9d %11d %9d\n",\r
+ fprintf(stream, "%4d %9d %9d %9d %9d %11d %9d\n",\r
tilepartno, tileno,\r
+ cstr_info->tile[tileno].tp[tilepartno].tp_start_pack,\r
cstr_info->tile[tileno].tp[tilepartno].tp_numpacks,\r
cstr_info->tile[tileno].tp[tilepartno].tp_start_pos,\r
cstr_info->tile[tileno].tp[tilepartno].tp_end_header,\r
cstr_info->tile[tileno].tp[tilepartno].tp_end_pos\r
);\r
if (cstr_info->prog == LRCP) { /* LRCP */\r
- fprintf(stream, "LRCP\npack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos\n");\r
+ fprintf(stream, "LRCP\npack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos disto\n");\r
\r
for (layno = 0; layno < cstr_info->numlayers; layno++) {\r
- for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+ for (resno = 0; resno < max_numdecompos + 1; resno++) {\r
for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
- int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
+ int prec_max;\r
+ if (resno > cstr_info->numdecompos[compno])\r
+ break;\r
+ prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
for (precno = 0; precno < prec_max; precno++) {\r
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
- fprintf(stream, "%4d %6d %7d %5d %6d %6d %6d %6d %7d\n",\r
- pack_nb, tileno, layno, resno, compno, precno, start_pos, end_ph_pos, end_pos);\r
+ disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+ fprintf(stream, "%4d %6d %7d %5d %6d %6d %6d %6d %7d %8e\n",\r
+ pack_nb, tileno, layno, resno, compno, precno, start_pos, end_ph_pos, end_pos, disto);\r
+ total_disto += disto;\r
pack_nb++;\r
}\r
}\r
} /* LRCP */\r
else if (cstr_info->prog == RLCP) { /* RLCP */\r
\r
- fprintf(stream, "RLCP\npack_nb tileno resno layno compno precno start_pos end_ph_pos end_pos\n");\r
+ fprintf(stream, "RLCP\npack_nb tileno resno layno compno precno start_pos end_ph_pos end_pos disto\n");\r
\r
- for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+ for (resno = 0; resno < max_numdecompos + 1; resno++) {\r
for (layno = 0; layno < cstr_info->numlayers; layno++) {\r
for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
- int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
+ int prec_max; \r
+ if (resno > cstr_info->numdecompos[compno])\r
+ break;\r
+ prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
for (precno = 0; precno < prec_max; precno++) {\r
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
- fprintf(stream, "%4d %6d %5d %7d %6d %6d %9d %9d %7d\n",\r
- pack_nb, tileno, resno, layno, compno, precno, start_pos, end_ph_pos, end_pos);\r
+ disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+ fprintf(stream, "%4d %6d %5d %7d %6d %6d %9d %9d %7d %8e\n",\r
+ pack_nb, tileno, resno, layno, compno, precno, start_pos, end_ph_pos, end_pos, disto);\r
+ total_disto += disto;\r
pack_nb++;\r
}\r
}\r
} /* RLCP */\r
else if (cstr_info->prog == RPCL) { /* RPCL */\r
\r
- fprintf(stream, "RPCL\npack_nb tileno resno precno compno layno start_pos end_ph_pos end_pos\n"); \r
+ fprintf(stream, "RPCL\npack_nb tileno resno precno compno layno start_pos end_ph_pos end_pos disto\n"); \r
\r
- for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+ for (resno = 0; resno < max_numdecompos + 1; resno++) {\r
/* I suppose components have same XRsiz, YRsiz */\r
int x0 = cstr_info->tile_Ox + tileno - (int)floor((float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;\r
int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;\r
int y1 = y0 + cstr_info->tile_y;\r
for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
+ if (resno > cstr_info->numdecompos[compno])\r
+ break;\r
for (precno = 0; precno < prec_max; precno++) {\r
int pcnx = cstr_info->tile[tileno].pw[resno];\r
- int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos - resno );\r
- int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos - resno );\r
+ int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );\r
+ int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );\r
int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;\r
int precno_y = (int) floor( (float)precno/(float)pcnx );\r
for(y = y0; y < y1; y++) { \r
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
- fprintf(stream, "%4d %6d %5d %6d %6d %7d %9d %9d %7d\n",\r
- pack_nb, tileno, resno, precno, compno, layno, start_pos, end_ph_pos, end_pos); \r
+ disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+ fprintf(stream, "%4d %6d %5d %6d %6d %7d %9d %9d %7d %8e\n",\r
+ pack_nb, tileno, resno, precno, compno, layno, start_pos, end_ph_pos, end_pos, disto); \r
+ total_disto += disto;\r
pack_nb++; \r
}\r
}\r
int x1 = x0 + cstr_info->tile_x;\r
int y1 = y0 + cstr_info->tile_y;\r
\r
- fprintf(stream, "PCRL\npack_nb tileno precno compno resno layno start_pos end_ph_pos end_pos\n"); \r
+ fprintf(stream, "PCRL\npack_nb tileno precno compno resno layno start_pos end_ph_pos end_pos disto\n"); \r
\r
for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
- for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+ for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {\r
int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
for (precno = 0; precno < prec_max; precno++) {\r
int pcnx = cstr_info->tile[tileno].pw[resno];\r
- int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos - resno );\r
- int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos - resno );\r
+ int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );\r
+ int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );\r
int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;\r
int precno_y = (int) floor( (float)precno/(float)pcnx );\r
for(y = y0; y < y1; y++) { \r
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
- fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d %9d %7d\n",\r
- pack_nb, tileno, precno, compno, resno, layno, start_pos, end_ph_pos, end_pos); \r
+ disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+ fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d %9d %7d %8e\n",\r
+ pack_nb, tileno, precno, compno, resno, layno, start_pos, end_ph_pos, end_pos, disto); \r
+ total_disto += disto;\r
pack_nb++; \r
}\r
}\r
} /* PCRL */\r
else { /* CPRL */\r
\r
- fprintf(stream, "CPRL\npack_nb tileno compno precno resno layno start_pos end_ph_pos end_pos\n"); \r
+ fprintf(stream, "CPRL\npack_nb tileno compno precno resno layno start_pos end_ph_pos end_pos disto\n"); \r
\r
for (compno = 0; compno < cstr_info->numcomps; compno++) {\r
/* I suppose components have same XRsiz, YRsiz */\r
int x1 = x0 + cstr_info->tile_x;\r
int y1 = y0 + cstr_info->tile_y;\r
\r
- for (resno = 0; resno < cstr_info->numdecompos + 1; resno++) {\r
+ for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {\r
int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];\r
for (precno = 0; precno < prec_max; precno++) {\r
int pcnx = cstr_info->tile[tileno].pw[resno];\r
- int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos - resno );\r
- int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos - resno );\r
+ int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );\r
+ int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );\r
int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;\r
int precno_y = (int) floor( (float)precno/(float)pcnx );\r
for(y = y0; y < y1; y++) {\r
start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;\r
end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;\r
end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;\r
- fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d %9d %7d\n",\r
- pack_nb, tileno, compno, precno, resno, layno, start_pos, end_ph_pos, end_pos); \r
+ disto = cstr_info->tile[tileno].packet[pack_nb].disto;\r
+ fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d %9d %7d %8e\n",\r
+ pack_nb, tileno, compno, precno, resno, layno, start_pos, end_ph_pos, end_pos, disto); \r
+ total_disto += disto;\r
pack_nb++; \r
}\r
}\r
} /* CPRL */ \r
} /* tileno */\r
\r
+ fprintf(stream, "%8e\n", cstr_info->D_max); /* SE max */\r
+ fprintf(stream, "%.8e\n", total_disto); /* SE totale */\r
+ fprintf(stream, "\nMARKER LIST\n");\r
+ fprintf(stream, "%d\n", cstr_info->marknum);\r
+ fprintf(stream, "type\tstart_pos length\n");\r
+ for (x = 0; x < cstr_info->marknum; x++)\r
+ fprintf(stream, "%X\t%9d %9d\n", cstr_info->marker[x].type, cstr_info->marker[x].pos, cstr_info->marker[x].len);\r
fclose(stream);\r
\r
fprintf(stderr,"Generated index file %s\n", index);\r
projects / openjpeg.git / blobdiff