Avoided ABI breakage
[openjpeg.git] / codec / image_to_j2k.c
index 44747ee0a848501511368a0f22916b189c7296e7..54ca14a1a5c47bc5bd42a691b662d4cf60653e61 100644 (file)
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <math.h>
 
 #include "openjpeg.h"
 #include "compat/getopt.h"
@@ -79,6 +80,8 @@ typedef struct img_folder{
        char set_imgdir;
        /** Enable Cod Format for output*/
        char set_out_format;
+       /** User specified rate stored in case of cinema option*/
+       float *rates;
 }img_fol_t;
 
 void encode_help_display() {
@@ -146,10 +149,10 @@ void encode_help_display() {
        fprintf(stdout,"\n");
        fprintf(stdout,"-h           : display the help information \n ");
        fprintf(stdout,"\n");
-       fprintf(stdout,"-cinema2k    : Digital Cinema 2K profile compliant codestream for 2K resolution.(-cinema2k 24 or 48) \n");
+       fprintf(stdout,"-cinema2K    : Digital Cinema 2K profile compliant codestream for 2K resolution.(-cinema2k 24 or 48) \n");
   fprintf(stdout,"       Need to specify the frames per second for a 2K resolution. Only 24 or 48 fps is allowed\n"); 
        fprintf(stdout,"\n");
-       fprintf(stdout,"-cinema4k    : Digital Cinema 4K profile compliant codestream for 4K resolution \n");
+       fprintf(stdout,"-cinema4K    : Digital Cinema 4K profile compliant codestream for 4K resolution \n");
        fprintf(stdout,"          Frames per second not required. Default value is 24fps\n"); 
        fprintf(stdout,"\n");
        fprintf(stdout,"-r           : different compression ratios for successive layers (-r 20,10,5)\n ");
@@ -196,7 +199,7 @@ void encode_help_display() {
        fprintf(stdout,"\n");
        fprintf(stdout,"-ROI         : c=%%d,U=%%d : quantization indices upshifted \n");
        fprintf(stdout,"               for component c=%%d [%%d = 0,1,2]\n");
-       fprintf(stdout,"               with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI:c=0,U=25) \n");
+       fprintf(stdout,"               with a value of U=%%d [0 <= %%d <= 37] (i.e. -ROI c=0,U=25) \n");
        fprintf(stdout,"\n");
        fprintf(stdout,"-d           : offset of the origin of the image (-d 150,300) \n");
        fprintf(stdout,"\n");
@@ -208,31 +211,31 @@ void encode_help_display() {
 #ifdef USE_JPWL
        fprintf(stdout,"-W           : adoption of JPWL (Part 11) capabilities (-W params)\n");
        fprintf(stdout,"               The parameters can be written and repeated in any order:\n");
-       fprintf(stdout,"               [h<tile><=type>,s<tile><=method>,a=<addr>,z=<size>,g=<range>,...\n");
-       fprintf(stdout,"                ...,p<tile:pack><=type>]\n");
+       fprintf(stdout,"               [h<tilepart><=type>,s<tilepart><=method>,a=<addr>,...\n");
+       fprintf(stdout,"                ...,z=<size>,g=<range>,p<tilepart:pack><=type>]\n");
        fprintf(stdout,"\n");
        fprintf(stdout,"                 h selects the header error protection (EPB): 'type' can be\n");
        fprintf(stdout,"                   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]\n");
-       fprintf(stdout,"                   if 'tile' is absent, it applies to main and tile headers\n");
-       fprintf(stdout,"                   if 'tile' is present, it applies from that tile\n");
-       fprintf(stdout,"                     onwards, up to the next h<tile> spec, or to the last tile\n");
+       fprintf(stdout,"                   if 'tilepart' is absent, it is for main and tile headers\n");
+       fprintf(stdout,"                   if 'tilepart' is present, it applies from that tile\n");
+       fprintf(stdout,"                     onwards, up to the next h<> spec, or to the last tilepart\n");
        fprintf(stdout,"                     in the codestream (max. %d specs)\n", JPWL_MAX_NO_TILESPECS);
        fprintf(stdout,"\n");
        fprintf(stdout,"                 p selects the packet error protection (EEP/UEP with EPBs)\n");
        fprintf(stdout,"                  to be applied to raw data: 'type' can be\n");
        fprintf(stdout,"                   [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]\n");
-       fprintf(stdout,"                   if 'tile:pack' is absent, it starts from tile 0, packet 0\n");
-       fprintf(stdout,"                   if 'tile:pack' is present, it applies from that tile\n");
+       fprintf(stdout,"                   if 'tilepart:pack' is absent, it is from tile 0, packet 0\n");
+       fprintf(stdout,"                   if 'tilepart:pack' is present, it applies from that tile\n");
        fprintf(stdout,"                     and that packet onwards, up to the next packet spec\n");
-       fprintf(stdout,"                     or to the last packet in the last tile in the codestream\n");
+       fprintf(stdout,"                     or to the last packet in the last tilepart in the stream\n");
        fprintf(stdout,"                     (max. %d specs)\n", JPWL_MAX_NO_PACKSPECS);
        fprintf(stdout,"\n");
        fprintf(stdout,"                 s enables sensitivity data insertion (ESD): 'method' can be\n");
        fprintf(stdout,"                   [-1=NO ESD 0=RELATIVE ERROR 1=MSE 2=MSE REDUCTION 3=PSNR\n");
        fprintf(stdout,"                    4=PSNR INCREMENT 5=MAXERR 6=TSE 7=RESERVED]\n");
-       fprintf(stdout,"                   if 'tile' is absent, it applies to main header only\n");
-       fprintf(stdout,"                   if 'tile' is present, it applies from that tile\n");
-       fprintf(stdout,"                     onwards, up to the next s<tile> spec, or to the last tile\n");
+       fprintf(stdout,"                   if 'tilepart' is absent, it is for main header only\n");
+       fprintf(stdout,"                   if 'tilepart' is present, it applies from that tile\n");
+       fprintf(stdout,"                     onwards, up to the next s<> spec, or to the last tilepart\n");
        fprintf(stdout,"                     in the codestream (max. %d specs)\n", JPWL_MAX_NO_TILESPECS);
        fprintf(stdout,"\n");
        fprintf(stdout,"                 g determines the addressing mode: <range> can be\n");
@@ -245,15 +248,16 @@ void encode_help_display() {
        fprintf(stdout,"                   1/2 bytes, for the transformed pseudo-floating point value\n");
        fprintf(stdout,"\n");
        fprintf(stdout,"                 ex.:\n");
-       fprintf(stdout," h,h0=64,h3=16,h5=32,p0=78,p0:24=56,p1,p3:0=0,p3:20=32,s=0,s0=6,s3=-1,a=0,g=1,z=1\n");
+       fprintf(stdout,"                   h,h0=64,h3=16,h5=32,p0=78,p0:24=56,p1,p3:0=0,p3:20=32,s=0,\n");
+       fprintf(stdout,"                     s0=6,s3=-1,a=0,g=1,z=1\n");
        fprintf(stdout,"                 means\n");
        fprintf(stdout,"                   predefined EPB in MH, rs(64,32) from TPH 0 to TPH 2,\n");
        fprintf(stdout,"                   CRC-16 in TPH 3 and TPH 4, CRC-32 in remaining TPHs,\n");
        fprintf(stdout,"                   UEP rs(78,32) for packets 0 to 23 of tile 0,\n");
-       fprintf(stdout,"                   UEP rs(56,32) for packets 24 to the last of tile 0,\n");
-       fprintf(stdout,"                   UEP rs default for packets of tile 1,\n");
-       fprintf(stdout,"                   no UEP for packets 0 to 19 of tile 3,\n");
-       fprintf(stdout,"                   UEP CRC-32 for packets 20 of tile 3 to last tile,\n");
+       fprintf(stdout,"                   UEP rs(56,32) for packs. 24 to the last of tilepart 0,\n");
+       fprintf(stdout,"                   UEP rs default for packets of tilepart 1,\n");
+       fprintf(stdout,"                   no UEP for packets 0 to 19 of tilepart 3,\n");
+       fprintf(stdout,"                   UEP CRC-32 for packs. 20 of tilepart 3 to last tilepart,\n");
        fprintf(stdout,"                   relative sensitivity ESD for MH,\n");
        fprintf(stdout,"                   TSE ESD from TPH 0 to TPH 2, byte range with automatic\n");
        fprintf(stdout,"                   size of addresses and 1 byte for each sensitivity value\n");
@@ -285,12 +289,22 @@ void encode_help_display() {
        fprintf(stdout,"decomposition_levels\n");
        fprintf(stdout,"[Precincts_size_X_res_Nr Precincts_size_Y_res_Nr]...\n");
        fprintf(stdout,"   [Precincts_size_X_res_0 Precincts_size_Y_res_0]\n");
+       fprintf(stdout,"Main_header_start_position\n");
        fprintf(stdout,"Main_header_end_position\n");
        fprintf(stdout,"Codestream_size\n");
-       fprintf(stdout,"Tile_0 start_pos end_Theader end_pos TotalDisto NumPix MaxMSE\n");
-       fprintf(stdout,"Tile_1   ''           ''        ''        ''       ''    ''\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"INFO ON TILES\n");
+       fprintf(stdout,"tileno start_pos end_hd end_tile nbparts disto nbpix disto/nbpix\n");
+       fprintf(stdout,"Tile_0 start_pos end_Theader end_pos NumParts TotalDisto NumPix MaxMSE\n");
+       fprintf(stdout,"Tile_1   ''           ''        ''        ''       ''    ''      ''\n");
+       fprintf(stdout,"...\n");
+       fprintf(stdout,"Tile_Nt   ''           ''        ''        ''       ''    ''     ''\n");
+       fprintf(stdout,"...\n");
+       fprintf(stdout,"TILE 0 DETAILS\n");
+       fprintf(stdout,"part_nb tileno num_packs start_pos end_tph_pos end_pos\n");
        fprintf(stdout,"...\n");
-       fprintf(stdout,"Tile_Nt   ''           ''        ''        ''       ''    ''\n");
+       fprintf(stdout,"Progression_string\n");
+       fprintf(stdout,"pack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos disto\n");
        fprintf(stdout,"Tpacket_0 Tile layer res. comp. prec. start_pos end_pos disto\n");
        fprintf(stdout,"...\n");
        fprintf(stdout,"Tpacket_Np ''   ''    ''   ''    ''       ''       ''     ''\n");
@@ -380,11 +394,10 @@ int get_file_format(char *filename) {
                return -1;
        ext++;
        for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
-               if(_strnicmp(ext, extension[i], 3) == 0) {
+               if(strnicmp(ext, extension[i], 3) == 0) {
                        return format[i];
                }
        }
-
        return -1;
 }
 
@@ -397,6 +410,7 @@ char * get_file_name(char *name){
 
 char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparameters_t *parameters){
        char image_filename[OPJ_PATH_LEN], infilename[OPJ_PATH_LEN],outfilename[OPJ_PATH_LEN],temp_ofname[OPJ_PATH_LEN];
+  char *temp_p, temp1[OPJ_PATH_LEN]="";
 
        strcpy(image_filename,dirptr->filename[imageno]);
        fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
@@ -408,6 +422,10 @@ char get_next_file(int imageno,dircnt_t *dirptr,img_fol_t *img_fol, opj_cparamet
 
        //Set output file
        strcpy(temp_ofname,get_file_name(image_filename));
+       while((temp_p = strtok(NULL,".")) != NULL){
+               strcat(temp_ofname,temp1);
+               sprintf(temp1,".%s",temp_p);
+       }
        if(img_fol->set_out_format==1){
                sprintf(outfilename,"%s/%s.%s",img_fol->imgdirpath,temp_ofname,img_fol->out_format);
                strncpy(parameters->outfile, outfilename, sizeof(outfilename));
@@ -466,7 +484,7 @@ void cinema_parameters(opj_cparameters_t *parameters){
 
 }
 
-void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image){
+void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){
        int i;
        float temp_rate;
        opj_poc_t *POC = NULL;
@@ -478,7 +496,7 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image){
                        parameters->numresolution = 6;
                }
                if (!((image->comps[0].w == 2048) | (image->comps[0].h == 1080))){
-                       fprintf(stdout,"Image coordinates %d x %d is not 2K compliant.\nJPEG Digital Cinema Profile-3"
+                       fprintf(stdout,"Image coordinates %d x %d is not 2K compliant.\nJPEG Digital Cinema Profile-3 "
                                "(2K profile) compliance requires that at least one of coordinates match 2048 x 1080\n",
                                image->comps[0].w,image->comps[0].h);
                        parameters->cp_rsiz = STD_RSIZ;
@@ -504,17 +522,19 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image){
        switch (parameters->cp_cinema){
                case CINEMA2K_24:
                case CINEMA4K_24:
-                       for(i=0;i<parameters->tcp_numlayers;i++){
+                       for(i=0 ; i<parameters->tcp_numlayers ; i++){
                                temp_rate = 0 ;
-                               if (parameters->tcp_rates[i]== 0){
+                               if (img_fol->rates[i]== 0){
                                        parameters->tcp_rates[0]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
                                        (CINEMA_24_CS * 8 * image->comps[0].dx * image->comps[0].dy);
                                }else{
                                        temp_rate =((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
-                                               (parameters->tcp_rates[i] * 8 * image->comps[0].dx * image->comps[0].dy);
+                                               (img_fol->rates[i] * 8 * image->comps[0].dx * image->comps[0].dy);
                                        if (temp_rate > CINEMA_24_CS ){
                                                parameters->tcp_rates[i]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
-                                                                                                                                                               (CINEMA_24_CS * 8 * image->comps[0].dx * image->comps[0].dy);
+                                               (CINEMA_24_CS * 8 * image->comps[0].dx * image->comps[0].dy);
+                                       }else{
+                                               parameters->tcp_rates[i]= img_fol->rates[i];
                                        }
                                }
                        }
@@ -522,17 +542,19 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image){
                        break;
                
                case CINEMA2K_48:
-       for(i=0;i<parameters->tcp_numlayers;i++){
+                       for(i=0 ; i<parameters->tcp_numlayers ; i++){
                                temp_rate = 0 ;
-                               if (parameters->tcp_rates[i]== 0){
+                               if (img_fol->rates[i]== 0){
                                        parameters->tcp_rates[0]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
                                        (CINEMA_48_CS * 8 * image->comps[0].dx * image->comps[0].dy);
                                }else{
                                        temp_rate =((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
-                                               (parameters->tcp_rates[i] * 8 * image->comps[0].dx * image->comps[0].dy);
+                                               (img_fol->rates[i] * 8 * image->comps[0].dx * image->comps[0].dy);
                                        if (temp_rate > CINEMA_48_CS ){
                                                parameters->tcp_rates[0]= ((float) (image->numcomps * image->comps[0].w * image->comps[0].h * image->comps[0].prec))/ 
-                                                                                                                                                               (CINEMA_48_CS * 8 * image->comps[0].dx * image->comps[0].dy);
+                                               (CINEMA_48_CS * 8 * image->comps[0].dx * image->comps[0].dy);
+                                       }else{
+                                               parameters->tcp_rates[i]= img_fol->rates[i];
                                        }
                                }
                        }
@@ -544,8 +566,284 @@ void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image){
 
 /* ------------------------------------------------------------------------------------ */
 
+/**
+Create an index and write it to a file
+@param cstr_info Codestream information 
+@param index Index filename
+@return Returns 0 if successful, returns 1 otherwise
+*/
+int write_index_file(opj_codestream_info_t *cstr_info, char *index) {
+       int tileno, compno, layno, resno, precno, pack_nb, x, y;
+       FILE *stream = NULL;
+       double total_disto = 0;
+/* UniPG>> */
+       int tilepartno;
+
+#ifdef USE_JPWL
+       if (!strcmp(index, JPWL_PRIVATEINDEX_NAME))
+               return 0;
+#endif /* USE_JPWL */
+/* <<UniPG */
+
+       if (!cstr_info)         
+               return 1;
+
+       stream = fopen(index, "w");
+       if (!stream) {
+               fprintf(stderr, "failed to open index file [%s] for writing\n", index);
+               return 1;
+       }
+       
+       fprintf(stream, "%d %d\n", cstr_info->image_w, cstr_info->image_h);
+       fprintf(stream, "%d\n", cstr_info->prog);
+       fprintf(stream, "%d %d\n", cstr_info->tile_x, cstr_info->tile_y);
+       fprintf(stream, "%d %d\n", cstr_info->tw, cstr_info->th);
+       fprintf(stream, "%d\n", cstr_info->numcomps);
+       fprintf(stream, "%d\n", cstr_info->numlayers);
+       fprintf(stream, "%d\n", cstr_info->numdecompos);
+
+       for (resno = cstr_info->numdecompos[0]; resno >= 0; resno--) {
+               fprintf(stream, "[%d,%d] ", 
+                       (1 << cstr_info->tile[0].pdx[resno]), (1 << cstr_info->tile[0].pdx[resno]));    /* based on tile 0 and component 0 */
+       }
+
+       fprintf(stream, "\n");
+/* UniPG>> */
+       fprintf(stream, "%d\n", cstr_info->main_head_start);
+/* <<UniPG */
+       fprintf(stream, "%d\n", cstr_info->main_head_end);
+       fprintf(stream, "%d\n", cstr_info->codestream_size);
+       
+       fprintf(stream, "\nINFO ON TILES\n");
+       fprintf(stream, "tileno start_pos  end_hd  end_tile   nbparts         disto     nbpix   disto/nbpix\n");
+       for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
+               fprintf(stream, "%4d %9d %9d %9d %9d %9e %9d %9e\n",
+                       cstr_info->tile[tileno].tileno,
+                       cstr_info->tile[tileno].start_pos,
+                       cstr_info->tile[tileno].end_header,
+                       cstr_info->tile[tileno].end_pos,
+                       cstr_info->tile[tileno].num_tps,
+                       cstr_info->tile[tileno].distotile, cstr_info->tile[tileno].numpix,
+                       cstr_info->tile[tileno].distotile / cstr_info->tile[tileno].numpix);
+       }
+               
+       for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) {
+               int start_pos, end_ph_pos, end_pos;
+               double disto = 0;
+               int max_numdecompos = 0;
+               pack_nb = 0;
+
+               for (compno = 0; compno < cstr_info->numcomps; compno++) {
+                       if (max_numdecompos < cstr_info->numdecompos[compno])
+                               max_numdecompos = cstr_info->numdecompos[compno];
+               }       
+
+               fprintf(stream, "\nTILE %d DETAILS\n", tileno); 
+               fprintf(stream, "part_nb tileno  start_pack num_packs  start_pos end_tph_pos   end_pos\n");
+               for (tilepartno = 0; tilepartno < cstr_info->tile[tileno].num_tps; tilepartno++)
+                       fprintf(stream, "%4d %9d   %9d %9d  %9d %11d %9d\n",
+                               tilepartno, tileno,
+                               cstr_info->tile[tileno].tp[tilepartno].tp_start_pack,
+                               cstr_info->tile[tileno].tp[tilepartno].tp_numpacks,
+                               cstr_info->tile[tileno].tp[tilepartno].tp_start_pos,
+                               cstr_info->tile[tileno].tp[tilepartno].tp_end_header,
+                               cstr_info->tile[tileno].tp[tilepartno].tp_end_pos
+                               );
+               if (cstr_info->prog == LRCP) {  /* LRCP */
+                       fprintf(stream, "LRCP\npack_nb tileno layno resno compno precno start_pos end_ph_pos end_pos disto\n");
+
+                       for (layno = 0; layno < cstr_info->numlayers; layno++) {
+                               for (resno = 0; resno < max_numdecompos + 1; resno++) {
+                                       for (compno = 0; compno < cstr_info->numcomps; compno++) {
+                                               int prec_max;
+                                               if (resno > cstr_info->numdecompos[compno])
+                                                       break;
+                                               prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+                                               for (precno = 0; precno < prec_max; precno++) {
+                                                       start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+                                                       end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+                                                       end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+                                                       fprintf(stream, "%4d %6d %7d %5d %6d  %6d    %6d     %6d %7d %8e\n",
+                                                               pack_nb, tileno, layno, resno, compno, precno, start_pos, end_ph_pos, end_pos, disto);
+                                                       total_disto += disto;
+                                                       pack_nb++;
+                                               }
+                                       }
+                               }
+                       }
+               } /* LRCP */
+               else if (cstr_info->prog == RLCP) {     /* RLCP */
+
+                       fprintf(stream, "RLCP\npack_nb tileno resno layno compno precno start_pos end_ph_pos end_pos disto\n");
+
+                       for (resno = 0; resno < max_numdecompos + 1; resno++) {
+                               for (layno = 0; layno < cstr_info->numlayers; layno++) {
+                                       for (compno = 0; compno < cstr_info->numcomps; compno++) {
+                                               int prec_max; 
+                                               if (resno > cstr_info->numdecompos[compno])
+                                                       break;
+                                               prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+                                               for (precno = 0; precno < prec_max; precno++) {
+                                                       start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+                                                       end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+                                                       end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+                                                       fprintf(stream, "%4d %6d %5d %7d %6d %6d %9d   %9d %7d %8e\n",
+                                                               pack_nb, tileno, resno, layno, compno, precno, start_pos, end_ph_pos, end_pos, disto);
+                                                       total_disto += disto;
+                                                       pack_nb++;
+                                               }
+                                       }
+                               }
+                       }
+               } /* RLCP */
+               else if (cstr_info->prog == RPCL) {     /* RPCL */
+
+                       fprintf(stream, "RPCL\npack_nb tileno resno precno compno layno start_pos end_ph_pos end_pos disto\n"); 
+
+                       for (resno = 0; resno < max_numdecompos + 1; resno++) {
+                               /* I suppose components have same XRsiz, YRsiz */
+                               int x0 = cstr_info->tile_Ox + tileno - (int)floor((float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
+                               int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
+                               int x1 = x0 + cstr_info->tile_x;
+                               int y1 = y0 + cstr_info->tile_y;
+                               for (compno = 0; compno < cstr_info->numcomps; compno++) {
+                                       int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+                                       if (resno > cstr_info->numdecompos[compno])
+                                                       break;
+                                       for (precno = 0; precno < prec_max; precno++) {
+                                               int pcnx = cstr_info->tile[tileno].pw[resno];
+                                               int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
+                                               int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
+                                               int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
+                                               int precno_y = (int) floor( (float)precno/(float)pcnx );
+                                               for(y = y0; y < y1; y++) {                                                      
+                                                       if (precno_y*pcy == y ) {
+                                                               for (x = x0; x < x1; x++) {                                                                     
+                                                                       if (precno_x*pcx == x ) {
+                                                                               for (layno = 0; layno < cstr_info->numlayers; layno++) {
+                                                                                       start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+                                                                                       end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+                                                                                       end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+                                                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+                                                                                       fprintf(stream, "%4d %6d %5d %6d %6d %7d %9d   %9d %7d %8e\n",
+                                                                                               pack_nb, tileno, resno, precno, compno, layno, start_pos, end_ph_pos, end_pos, disto); 
+                                                                                       total_disto += disto;
+                                                                                       pack_nb++; 
+                                                                               }
+                                                                       }
+                                                               }/* x = x0..x1 */
+                                                       } 
+                                               }  /* y = y0..y1 */
+                                       } /* precno */
+                               } /* compno */
+                       } /* resno */
+               } /* RPCL */
+               else if (cstr_info->prog == PCRL) {     /* PCRL */
+                       /* I suppose components have same XRsiz, YRsiz */
+                       int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
+                       int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
+                       int x1 = x0 + cstr_info->tile_x;
+                       int y1 = y0 + cstr_info->tile_y;
+
+                       fprintf(stream, "PCRL\npack_nb tileno precno compno resno layno start_pos end_ph_pos end_pos disto\n"); 
+
+                       for (compno = 0; compno < cstr_info->numcomps; compno++) {
+                               for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {
+                                       int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+                                       for (precno = 0; precno < prec_max; precno++) {
+                                               int pcnx = cstr_info->tile[tileno].pw[resno];
+                                               int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
+                                               int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
+                                               int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
+                                               int precno_y = (int) floor( (float)precno/(float)pcnx );
+                                               for(y = y0; y < y1; y++) {                                                      
+                                                       if (precno_y*pcy == y ) {
+                                                               for (x = x0; x < x1; x++) {                                                                     
+                                                                       if (precno_x*pcx == x ) {
+                                                                               for (layno = 0; layno < cstr_info->numlayers; layno++) {
+                                                                                       start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+                                                                                       end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+                                                                                       end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+                                                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+                                                                                       fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d   %9d %7d %8e\n",
+                                                                                               pack_nb, tileno, precno, compno, resno, layno, start_pos, end_ph_pos, end_pos, disto); 
+                                                                                       total_disto += disto;
+                                                                                       pack_nb++; 
+                                                                               }
+                                                                       }
+                                                               }/* x = x0..x1 */
+                                                       } 
+                                               }  /* y = y0..y1 */
+                                       } /* precno */
+                               } /* resno */
+                       } /* compno */
+               } /* PCRL */
+               else {  /* CPRL */
+
+                       fprintf(stream, "CPRL\npack_nb tileno compno precno resno layno start_pos end_ph_pos end_pos disto\n"); 
+
+                       for (compno = 0; compno < cstr_info->numcomps; compno++) {
+                               /* I suppose components have same XRsiz, YRsiz */
+                               int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x;
+                               int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y;
+                               int x1 = x0 + cstr_info->tile_x;
+                               int y1 = y0 + cstr_info->tile_y;
+                               
+                               for (resno = 0; resno < cstr_info->numdecompos[compno] + 1; resno++) {
+                                       int prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno];
+                                       for (precno = 0; precno < prec_max; precno++) {
+                                               int pcnx = cstr_info->tile[tileno].pw[resno];
+                                               int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno );
+                                               int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno );
+                                               int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx;
+                                               int precno_y = (int) floor( (float)precno/(float)pcnx );
+                                               for(y = y0; y < y1; y++) {
+                                                       if (precno_y*pcy == y ) {
+                                                               for (x = x0; x < x1; x++) {
+                                                                       if (precno_x*pcx == x ) {
+                                                                               for (layno = 0; layno < cstr_info->numlayers; layno++) {
+                                                                                       start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos;
+                                                                                       end_ph_pos = cstr_info->tile[tileno].packet[pack_nb].end_ph_pos;
+                                                                                       end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos;
+                                                                                       disto = cstr_info->tile[tileno].packet[pack_nb].disto;
+                                                                                       fprintf(stream, "%4d %6d %6d %6d %5d %7d %9d   %9d %7d %8e\n",
+                                                                                               pack_nb, tileno, compno, precno, resno, layno, start_pos, end_ph_pos, end_pos, disto); 
+                                                                                       total_disto += disto;
+                                                                                       pack_nb++; 
+                                                                               }
+                                                                       }
+                                                               }/* x = x0..x1 */
+                                                       }
+                                               } /* y = y0..y1 */
+                                       } /* precno */
+                               } /* resno */
+                       } /* compno */
+               } /* CPRL */   
+       } /* tileno */
+       
+       fprintf(stream, "%8e\n", cstr_info->D_max); /* SE max */
+       fprintf(stream, "%.8e\n", total_disto); /* SE totale */
+/* UniPG>> */
+       /* print the markers' list */
+       fprintf(stream, "\nMARKER LIST\n");
+       fprintf(stream, "%d\n", cstr_info->marknum);
+       fprintf(stream, "type\tstart_pos    length\n");
+       for (x = 0; x < cstr_info->marknum; x++)
+               fprintf(stream, "%X\t%9d %9d\n", cstr_info->marker[x].type, cstr_info->marker[x].pos, cstr_info->marker[x].len);
+/* <<UniPG */
+       fclose(stream);
+
+       fprintf(stderr,"Generated index file %s\n", index);
+
+       return 0;
+}
+
+/* ------------------------------------------------------------------------------------ */
+
 int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
-                                                                                                       img_fol_t *img_fol, raw_cparameters_t *raw_cp) {
+                                                                                                       img_fol_t *img_fol, raw_cparameters_t *raw_cp, char *indexfilename) {
        int i, j,totlen;
        option_t long_option[]={
                {"cinema2K",REQ_ARG, NULL ,'w'},
@@ -556,6 +854,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                {"EPH",NO_ARG, NULL ,'E'},
                {"OutFor",REQ_ARG, NULL ,'O'},
                {"POC",REQ_ARG, NULL ,'P'},
+               {"ROI",REQ_ARG, NULL ,'R'},
        };
 
        /* parse the command line */
@@ -816,8 +1115,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                        case 'x':                       /* creation of index file */
                        {
                                char *index = optarg;
-                               strncpy(parameters->index, index, sizeof(parameters->index)-1);
-                               parameters->index_on = 1;
+                               strncpy(indexfilename, index, OPJ_PATH_LEN);
                        }
                        break;
 
@@ -931,9 +1229,9 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
 
                        case 'R':                       /* ROI */
                        {
-                               if (sscanf(optarg, "OI:c=%d,U=%d", &parameters->roi_compno,
+                               if (sscanf(optarg, "c=%d,U=%d", &parameters->roi_compno,
                                            &parameters->roi_shift) != 2) {
-                                       fprintf(stderr, "ROI error !! [-ROI:c='compno',U='shift']\n");
+                                       fprintf(stderr, "ROI error !! [-ROI c='compno',U='shift']\n");
                                        return 1;
                                }
                        }
@@ -1031,9 +1329,8 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                                int hprot, pprot, sens, addr, size, range;
 
                                /* we need to enable indexing */
-                               if (!parameters->index_on) {
-                                       strncpy(parameters->index, JPWL_PRIVATEINDEX_NAME, sizeof(parameters->index)-1);
-                                       parameters->index_on = 1;
+                               if (!indexfilename) {
+                                       strncpy(indexfilename, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN);
                                }
 
                                /* search for different protection methods */
@@ -1062,11 +1359,11 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                                                        /* Tile part header, specified */
                                                        if (!((hprot == 0) || (hprot == 1) || (hprot == 16) || (hprot == 32) ||
                                                                ((hprot >= 37) && (hprot <= 128)))) {
-                                                               fprintf(stderr, "ERROR -> invalid tile header protection method h = %d\n", hprot);
+                                                               fprintf(stderr, "ERROR -> invalid tile part header protection method h = %d\n", hprot);
                                                                return 1;
                                                        }
                                                        if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method t = %d\n", tile);
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method t = %d\n", tile);
                                                                return 1;
                                                        }
                                                        if (tilespec < JPWL_MAX_NO_TILESPECS) {
@@ -1077,7 +1374,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                                                } else if(sscanf(token, "h%d", &tile) == 1) {
                                                        /* Tile part header, unspecified */
                                                        if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method t = %d\n", tile);
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method t = %d\n", tile);
                                                                return 1;
                                                        }
                                                        if (tilespec < JPWL_MAX_NO_TILESPECS) {
@@ -1123,7 +1420,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                                                                return 1;
                                                        }
                                                        if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method p = %d\n", tile);
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
                                                                return 1;
                                                        }
                                                        if (packspec < JPWL_MAX_NO_PACKSPECS) {
@@ -1140,7 +1437,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                                                                return 1;
                                                        }
                                                        if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method p = %d\n", tile);
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
                                                                return 1;
                                                        }
                                                        if (pack < 0) {
@@ -1161,7 +1458,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                                                                return 1;
                                                        }
                                                        if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method p = %d\n", tile);
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
                                                                return 1;
                                                        }
                                                        if (pack < 0) {
@@ -1177,7 +1474,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                                                } else if (sscanf(token, "p%d", &tile) == 1) {
                                                        /* default from a tile on */
                                                        if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method p = %d\n", tile);
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on protection method p = %d\n", tile);
                                                                return 1;
                                                        }
                                                        if (packspec < JPWL_MAX_NO_PACKSPECS) {
@@ -1218,11 +1515,11 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                                                } else if(sscanf(token, "s%d=%d", &tile, &sens) == 2) {
                                                        /* Tile part header, specified */
                                                        if ((sens < -1) || (sens > 7)) {
-                                                               fprintf(stderr, "ERROR -> invalid tile header sensitivity method s = %d\n", sens);
+                                                               fprintf(stderr, "ERROR -> invalid tile part header sensitivity method s = %d\n", sens);
                                                                return 1;
                                                        }
                                                        if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile number on sensitivity method t = %d\n", tile);
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on sensitivity method t = %d\n", tile);
                                                                return 1;
                                                        }
                                                        if (tilespec < JPWL_MAX_NO_TILESPECS) {
@@ -1233,7 +1530,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,
                                                } else if(sscanf(token, "s%d", &tile) == 1) {
                                                        /* Tile part header, unspecified */
                                                        if (tile < 0) {
-                                                               fprintf(stderr, "ERROR -> invalid tile number on sensitivity method t = %d\n", tile);
+                                                               fprintf(stderr, "ERROR -> invalid tile part number on sensitivity method t = %d\n", tile);
                                                                return 1;
                                                        }
                                                        if (tilespec < JPWL_MAX_NO_TILESPECS) {
@@ -1460,6 +1757,8 @@ int main(int argc, char **argv) {
        int imageno;
        dircnt_t *dirptr;
        raw_cparameters_t raw_cp;
+       opj_codestream_info_t cstr_info;                /* Codestream information structure */
+       char indexfilename[OPJ_PATH_LEN];       /* index file name */
 
        /*
        configure the event callbacks (not required)
@@ -1473,12 +1772,20 @@ int main(int argc, char **argv) {
        /* set encoding parameters to default values */
        opj_set_default_encoder_parameters(&parameters);
 
+       /* Initialize indexfilename and img_fol */
+       *indexfilename = 0;
+       memset(&img_fol,0,sizeof(img_fol_t));
+
        /* parse input and get user encoding parameters */
-       if(parse_cmdline_encoder(argc, argv, &parameters,&img_fol, &raw_cp) == 1) {
-               return 0;
+       if(parse_cmdline_encoder(argc, argv, &parameters,&img_fol, &raw_cp, indexfilename) == 1) {
+               return 1;
        }
        
        if (parameters.cp_cinema){
+               img_fol.rates = (float*)malloc(parameters.tcp_numlayers * sizeof(float));
+               for(i=0; i< parameters.tcp_numlayers; i++){
+                       img_fol.rates[i] = parameters.tcp_rates[i];
+               }
                cinema_parameters(&parameters);
        }                               
 
@@ -1496,19 +1803,15 @@ int main(int argc, char **argv) {
                sprintf(parameters.cp_comment,"%s%s", comment, version);
 #endif
 /* <<UniPG */
-
        }
 
        /* Read directory if necessary */
-
        if(img_fol.set_imgdir==1){
                num_images=get_num_images(img_fol.imgdirpath);
-
                dirptr=(dircnt_t*)malloc(sizeof(dircnt_t));
                if(dirptr){
                        dirptr->filename_buf = (char*)malloc(num_images*OPJ_PATH_LEN*sizeof(char));     // Stores at max 10 image file names
                        dirptr->filename = (char**) malloc(num_images*sizeof(char*));
-
                        if(!dirptr->filename_buf){
                                return 0;
                        }
@@ -1527,13 +1830,10 @@ int main(int argc, char **argv) {
                num_images=1;
        }
        /*Encoding image one by one*/
-       for(imageno=0;imageno<num_images;imageno++)
-       {
-
+       for(imageno=0;imageno<num_images;imageno++)     {
                image = NULL;
                fprintf(stderr,"\n");
                
-
                if(img_fol.set_imgdir==1){
                        if (get_next_file(imageno, dirptr,&img_fol, &parameters)) {
                                fprintf(stderr,"skipping file...\n");
@@ -1614,7 +1914,7 @@ int main(int argc, char **argv) {
                        parameters.tcp_mct = image->numcomps == 3 ? 1 : 0;
 
                        if(parameters.cp_cinema){
-                               cinema_setup_encoder(&parameters,image);
+                               cinema_setup_encoder(&parameters,image,&img_fol);
                        }
 
                        /* encode the destination image */
@@ -1639,7 +1939,10 @@ int main(int argc, char **argv) {
                                cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
 
                                /* encode the image */
-                               bSuccess = opj_encode(cinfo, cio, image, parameters.index);
+                               if (*indexfilename)                                     // If need to extract codestream information
+                                       bSuccess = opj_encode_with_info(cinfo, cio, image, &cstr_info);
+                               else
+                                       bSuccess = opj_encode(cinfo, cio, image, NULL);
                                if (!bSuccess) {
                                        opj_cio_close(cio);
                                        fprintf(stderr, "failed to encode image\n");
@@ -1660,9 +1963,18 @@ int main(int argc, char **argv) {
                                /* close and free the byte stream */
                                opj_cio_close(cio);
 
+                               /* Write the index to disk */
+                               if (*indexfilename) {
+                                       bSuccess = write_index_file(&cstr_info, indexfilename);
+                                       if (bSuccess) {
+                                               fprintf(stderr, "Failed to output index file\n");
+                                       }
+                               }
+
                                /* free remaining compression structures */
                                opj_destroy_compress(cinfo);
-
+                               if (*indexfilename)
+                                       opj_destroy_cstr_info(&cstr_info);
                        } else {                        /* JP2 format output */
                                int codestream_length;
                                opj_cio_t *cio = NULL;
@@ -1682,7 +1994,10 @@ int main(int argc, char **argv) {
                                cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
 
                                /* encode the image */
-                               bSuccess = opj_encode(cinfo, cio, image, parameters.index);
+                               if (*indexfilename)                                     // If need to extract codestream information
+                                       bSuccess = opj_encode_with_info(cinfo, cio, image, &cstr_info);
+                               else
+                                       bSuccess = opj_encode(cinfo, cio, image, NULL);
                                if (!bSuccess) {
                                        opj_cio_close(cio);
                                        fprintf(stderr, "failed to encode image\n");
@@ -1701,10 +2016,19 @@ int main(int argc, char **argv) {
                                fprintf(stderr,"Generated outfile %s\n",parameters.outfile);
                                /* close and free the byte stream */
                                opj_cio_close(cio);
+                               
+                               /* Write the index to disk */
+                               if (*indexfilename) {
+                                       bSuccess = write_index_file(&cstr_info, indexfilename);
+                                       if (bSuccess) {
+                                               fprintf(stderr, "Failed to output index file\n");
+                                       }
+                               }
 
                                /* free remaining compression structures */
                                opj_destroy_compress(cinfo);
-
+                               if (*indexfilename)
+                                       opj_destroy_cstr_info(&cstr_info);
                        }
        
                        /* free image data */
@@ -1717,4 +2041,3 @@ int main(int argc, char **argv) {
 
        return 0;
 }
-