Digital cinema compliance for 4K chosen by "-cinema4K" option. Modification in image_...
[openjpeg.git] / codec / image_to_j2k.c
index 77bb3362871a14a41d2ed724b279bb650338411e..b5e056dfd979d4157a106c57cb1ae1de866f5d81 100644 (file)
@@ -1,9 +1,11 @@
 /*
+ * Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2007, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
- * Copyright (c) 2003-2005, Francois Devaux and Antonin Descampe
- * Copyright (c) 2005, Herv� Drolon, FreeImage Team
- * Copyright (c) 2002-2005, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ * Copyright (c) 2005, Herve Drolon, FreeImage Team 
+ * Copyright (c) 2006-2007, Parvatha Elangovan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,6 +36,7 @@
 #include "openjpeg.h"
 #include "compat/getopt.h"
 #include "convert.h"
+#include "dirent.h"
 
 #ifndef WIN32
 #define stricmp strcasecmp
 #define J2K_CFMT 0
 #define JP2_CFMT 1
 #define JPT_CFMT 2
-#define MJ2_CFMT 3
-#define PXM_DFMT 0
-#define PGX_DFMT 1
-#define BMP_DFMT 2
-#define YUV_DFMT 3
+
+#define PXM_DFMT 10
+#define PGX_DFMT 11
+#define BMP_DFMT 12
+#define YUV_DFMT 13
+#define TIF_DFMT 14
 
 /* ----------------------------------------------------------------------- */
+#define CINEMA_24_CS 1302083   /*Codestream length for 24fps*/
+#define CINEMA_48_CS 651041            /*Codestream length for 48fps*/
+#define COMP_24_CS 1041666             /*Maximum size per color component for 2K & 4K @ 24fps*/
+#define COMP_48_CS 520833              /*Maximum size per color component for 2K @ 48fps*/
+
+typedef struct dircnt{
+       /** Buffer for holding images read from Directory*/
+       char *filename_buf;
+       /** Pointer to the buffer*/
+       char **filename;
+}dircnt_t;
+
+typedef struct img_folder{
+       /** The directory path of the folder containing input images*/
+       char *imgdirpath;
+       /** Output format*/
+       char *out_format;
+       /** Enable option*/
+       char set_imgdir;
+       /** Enable Cod Format for output*/
+       char set_out_format;
+
+}img_fol_t;
 
 void encode_help_display() {
        fprintf(stdout,"HELP\n----\n\n");
        fprintf(stdout,"- the -h option displays this help information on screen\n\n");
 
-
-       fprintf(stdout,"List of parameters for the JPEG 2000 encoder:\n");
+/* UniPG>> */
+       fprintf(stdout,"List of parameters for the JPEG 2000 "
+#ifdef USE_JPWL
+               "+ JPWL "
+#endif /* USE_JPWL */
+               "encoder:\n");
+/* <<UniPG */
        fprintf(stdout,"\n");
        fprintf(stdout,"REMARKS:\n");
        fprintf(stdout,"---------\n");
@@ -88,13 +120,28 @@ void encode_help_display() {
        fprintf(stdout," * No offset of the origin of the image\n");
        fprintf(stdout," * No offset of the origin of the tiles\n");
        fprintf(stdout," * Reversible DWT 5-3\n");
+/* UniPG>> */
+#ifdef USE_JPWL
+       fprintf(stdout," * No JPWL protection\n");
+#endif /* USE_JPWL */
+/* <<UniPG */
        fprintf(stdout,"\n");
        fprintf(stdout,"Parameters:\n");
        fprintf(stdout,"------------\n");
        fprintf(stdout,"\n");
        fprintf(stdout,"Required Parameters (except with -h):\n");
+       fprintf(stdout,"One of the two options -ImgDir or -i must be used\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-ImgDir      : Image file Directory path (example ../Images) \n");
+       fprintf(stdout,"    When using this option -OutFor must be used\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"-OutFor \n");
+       fprintf(stdout,"    REQUIRED only if -ImgDir is used\n");
+       fprintf(stdout,"          Need to specify only format without filename <BMP>  \n");
+       fprintf(stdout,"    Currently accepts PGM, PPM, PNM, PGX, BMP format\n");
        fprintf(stdout,"\n");
        fprintf(stdout,"-i           : source file  (-i source.pnm also *.pgm, *.ppm) \n");
+       fprintf(stdout,"    When using this option -o must be used\n");
        fprintf(stdout,"\n");
        fprintf(stdout,"-o           : destination file (-o dest.j2k or .jp2) \n");
        fprintf(stdout,"\n");
@@ -102,6 +149,12 @@ 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,"       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,"          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 ");
        fprintf(stdout,"                 - The rate specified for each quality level is the desired \n");
        fprintf(stdout,"                   compression factor.\n");
@@ -129,6 +182,10 @@ void encode_help_display() {
        fprintf(stdout,"-s           : subsampling factor (-s 2,2) [-s X,Y] \n");
        fprintf(stdout,"             Remark: subsampling bigger than 2 can produce error\n");
        fprintf(stdout,"\n");
+       fprintf(stdout,"-POC         : Progression order change (-POC T1=0,0,1,5,3,CPRL/T1=5,0,1,6,3,CPRL) \n");
+       fprintf(stdout,"      Example: T1=0,0,1,5,3,CPRL \n");
+       fprintf(stdout,"                         : Ttilenumber=Resolution num start,Component num start,Layer num end,Resolution num end,Component num end,Progression order\n");
+       fprintf(stdout,"\n");
        fprintf(stdout,"-SOP         : write SOP marker before each packet \n");
        fprintf(stdout,"\n");
        fprintf(stdout,"-EPH         : write EPH marker after each header packet \n");
@@ -150,6 +207,72 @@ void encode_help_display() {
        fprintf(stdout,"\n");
        fprintf(stdout,"-I           : use the irreversible DWT 9-7 (-I) \n");
        fprintf(stdout,"\n");
+/* UniPG>> */
+#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,"\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,"                     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,"                     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,"                     (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,"                     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");
+       fprintf(stdout,"                   [0=PACKET 1=BYTE RANGE 2=PACKET RANGE]\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 a determines the size of data addressing: <addr> can be\n");
+       fprintf(stdout,"                   2/4 bytes (small/large codestreams). If not set, auto-mode\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 z determines the size of sensitivity values: <size> can be\n");
+       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,"                 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,"                   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");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 ex.:\n");
+       fprintf(stdout,"                       h,s,p\n");
+       fprintf(stdout,"                 means\n");
+       fprintf(stdout,"                   default protection to headers (MH and TPHs) as well as\n");
+       fprintf(stdout,"                   data packets, one ESD in MH\n");
+       fprintf(stdout,"\n");
+       fprintf(stdout,"                 N.B.: use the following recommendations when specifying\n");
+       fprintf(stdout,"                       the JPWL parameters list\n");
+       fprintf(stdout,"                   - when you use UEP, always pair the 'p' option with 'h'\n");
+       fprintf(stdout,"                 \n");
+#endif /* USE_JPWL */
+/* <<UniPG */
        fprintf(stdout,"IMPORTANT:\n");
        fprintf(stdout,"-----------\n");
        fprintf(stdout,"\n");
@@ -159,6 +282,9 @@ void encode_help_display() {
        fprintf(stdout,"Image_height Image_width\n");
        fprintf(stdout,"progression order\n");
        fprintf(stdout,"Tiles_size_X Tiles_size_Y\n");
+/* UniPG>> */
+       fprintf(stdout,"Tiles_nb_X Tiles_nb_Y\n");
+/* <<UniPG */
        fprintf(stdout,"Components_nb\n");
        fprintf(stdout,"Layers_nb\n");
        fprintf(stdout,"decomposition_levels\n");
@@ -199,11 +325,65 @@ OPJ_PROG_ORDER give_progression(char progression[4]) {
        return PROG_UNKNOWN;
 }
 
+int get_num_images(char *imgdirpath){
+       DIR *dir;
+       struct dirent* content; 
+       int num_images = 0;
+
+       /*Reading the input images from given input directory*/
+
+       dir= opendir(imgdirpath);
+       if(!dir){
+               fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+               return 0;
+       }
+
+       num_images=0;
+       while((content=readdir(dir))!=NULL){
+               if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+                       continue;
+               num_images++;
+       }
+       return num_images;
+}
+
+int load_images(dircnt_t *dirptr, char *imgdirpath){
+       DIR *dir;
+       struct dirent* content; 
+       int i = 0;
+
+       /*Reading the input images from given input directory*/
+
+       dir= opendir(imgdirpath);
+       if(!dir){
+               fprintf(stderr,"Could not open Folder %s\n",imgdirpath);
+               return 1;
+       }else   {
+               fprintf(stderr,"Folder opened successfully\n");
+       }
+
+       while((content=readdir(dir))!=NULL){
+               if(strcmp(".",content->d_name)==0 || strcmp("..",content->d_name)==0 )
+                       continue;
+
+               strcpy(dirptr->filename[i],content->d_name);
+               i++;
+       }
+       return 0;       
+}
+
 int get_file_format(char *filename) {
        unsigned int i;
-       static const char *extension[] = {"pgx", "pnm", "pgm", "ppm", "bmp", "j2k", "jp2" };
-       static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, J2K_CFMT, JP2_CFMT };
-       char * ext = strrchr(filename, '.') + 1;
+       static const char *extension[] = {
+    "pgx", "pnm", "pgm", "ppm", "bmp","tif", "j2k", "jp2"
+    };
+       static const int format[] = {
+    PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT,TIF_DFMT, J2K_CFMT, JP2_CFMT
+    };
+       char * ext = strrchr(filename, '.');
+       if (ext == NULL)
+               return -1;
+       ext++;
        for(i = 0; i < sizeof(format)/sizeof(*format); i++) {
                if(strnicmp(ext, extension[i], 3) == 0) {
                        return format[i];
@@ -213,15 +393,181 @@ int get_file_format(char *filename) {
        return -1;
 }
 
+char * get_file_name(char *name){
+       char *fname;
+       fname= (char*)malloc(OPJ_PATH_LEN*sizeof(char));
+       fname= strtok(name,".");
+       return fname;
+}
+
+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];
+
+       strcpy(image_filename,dirptr->filename[imageno]);
+       fprintf(stderr,"File Number %d \"%s\"\n",imageno,image_filename);
+       parameters->decod_format = get_file_format(image_filename);
+       if (parameters->decod_format == -1)
+               return 1;
+       sprintf(infilename,"%s/%s",img_fol->imgdirpath,image_filename);
+       strncpy(parameters->infile, infilename, sizeof(infilename));
+
+       //Set output file
+       strcpy(temp_ofname,get_file_name(image_filename));
+       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));
+       }
+ return 0;
+}
+
+static int initialise_4K_poc(opj_poc_t *POC, int numres){
+       POC[0].tile  = 1; 
+       POC[0].resno0  = 0; 
+       POC[0].compno0 = 0;
+       POC[0].layno1  = 1;
+       POC[0].resno1  = numres-1;
+       POC[0].compno1 = 3;
+       POC[0].prg1 = CPRL;
+       POC[1].tile  = 1;
+       POC[1].resno0  = numres-1; 
+       POC[1].compno0 = 0;
+       POC[1].layno1  = 1;
+       POC[1].resno1  = numres;
+       POC[1].compno1 = 3;
+       POC[1].prg1 = CPRL;
+       return 2;
+}
+
+void cinema_parameters(opj_cparameters_t *parameters){
+       parameters->tile_size_on = false;
+       parameters->cp_tdx=1;
+       parameters->cp_tdy=1;
+       
+       /*Tile part*/
+       parameters->tp_flag = 'C';
+       parameters->tp_on = 1;
+
+       /*Tile and Image shall be at (0,0)*/
+       parameters->cp_tx0 = 0;
+       parameters->cp_ty0 = 0;
+       parameters->image_offset_x0 = 0;
+       parameters->image_offset_y0 = 0;
+
+       /*Codeblock size= 32*32*/
+       parameters->cblockw_init = 32;  
+       parameters->cblockh_init = 32;
+       parameters->csty |= 0x01;
+
+       /*The progression order shall be CPRL*/
+       parameters->prog_order = CPRL;
+
+       /* No ROI */
+       parameters->roi_compno = -1;
+
+       parameters->subsampling_dx = 1;         parameters->subsampling_dy = 1;
+}
+
+void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image){
+       int i;
+       float temp_rate;
+       opj_poc_t *POC = NULL;
+
+       switch (parameters->cp_cinema){
+       case CINEMA2K_24:
+       case CINEMA2K_48:
+               if(parameters->numresolution > 6){
+                       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.\nDCI 2K compliance requires that atleast one of coordinates match 2048 x 1080\n",image->comps[0].w,image->comps[0].h);
+                       parameters->cp_rsiz = STD_RSIZ;
+               }
+       break;
+       
+       case CINEMA4K_24:
+               if(parameters->numresolution < 1){
+                               parameters->numresolution = 1;
+                       }else if(parameters->numresolution > 7){
+                               parameters->numresolution = 7;
+                       }
+               if (!((image->comps[0].w == 4096) & (image->comps[0].h == 2160))){
+                       fprintf(stdout,"Image coordinates %d x %d is not 4K compliant.\nDCI 4K compliance requires that atleast one of coordinates match 4096 x 2160\n",image->comps[0].w,image->comps[0].h);
+                       parameters->cp_rsiz = STD_RSIZ;
+               }
+               parameters->numpocs = initialise_4K_poc(parameters->POC,parameters->numresolution);
+               break;
+       }
+
+       switch (parameters->cp_cinema){
+               case CINEMA2K_24:
+               case CINEMA4K_24:
+                       for(i=0;i<parameters->tcp_numlayers;i++){
+                               temp_rate = 0 ;
+                               if (parameters->tcp_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);
+                                       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);
+                                       }
+                               }
+                       }
+                       parameters->max_comp_size = COMP_24_CS;
+                       break;
+               
+               case CINEMA2K_48:
+       for(i=0;i<parameters->tcp_numlayers;i++){
+                               temp_rate = 0 ;
+                               if (parameters->tcp_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);
+                                       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);
+                                       }
+                               }
+                       }
+                       parameters->max_comp_size = COMP_48_CS;
+                       break;
+       }
+       parameters->cp_disto_alloc = 1;
+}
+
 /* ------------------------------------------------------------------------------------ */
 
-int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters) {
-       int i, j;
+int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters,img_fol_t *img_fol) {
+       int i, j,totlen;
+       option_t long_option[]={
+               {"cinema2K",REQ_ARG, NULL ,'w'},
+               {"cinema4K",NO_ARG, NULL ,'y'},
+               {"ImgDir",REQ_ARG, NULL ,'z'},
+               {"TP",REQ_ARG, NULL ,'v'},
+               {"SOP",NO_ARG, NULL ,'S'},
+               {"EPH",NO_ARG, NULL ,'E'},
+               {"OutFor",REQ_ARG, NULL ,'O'},
+               {"POC",REQ_ARG, NULL ,'P'},
+       };
 
        /* parse the command line */
+/* UniPG>> */
+       const char optlist[] = "i:o:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:"
+#ifdef USE_JPWL
+               "W:"
+#endif /* USE_JPWL */
+               ;
+
+       totlen=sizeof(long_option);
+       img_fol->set_out_format=0;
 
        while (1) {
-               int c = getopt(argc, argv, "i:o:r:q:f:t:n:c:b:x:p:s:d:hP:S:E:M:R:T:C:I");
+    int c = getopt_long(argc, argv, optlist,long_option,totlen);
+/* <<UniPG */
                if (c == -1)
                        break;
                switch (c) {
@@ -233,17 +579,19 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                        case PGX_DFMT:
                                        case PXM_DFMT:
                                        case BMP_DFMT:
+                                       case TIF_DFMT:
                                                break;
                                        default:
-                                               fprintf(stderr, 
-                                                       "!! Unrecognized format for infile : %s [accept only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n\n", 
+                                               fprintf(stderr,
+                                                       "!! Unrecognized format for infile : %s "
+              "[accept only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp or *.tif] !!\n\n", 
                                                        infile);
                                                return 1;
                                }
-                               strncpy(parameters->infile, infile, MAX_PATH);
+                               strncpy(parameters->infile, infile, sizeof(parameters->infile)-1);
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
 
                        case 'o':                       /* output file */
@@ -258,16 +606,40 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                                fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile);
                                                return 1;
                                }
-                               strncpy(parameters->outfile, outfile, MAX_PATH);
+                               strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1);
                        }
                        break;
 
                                /* ----------------------------------------------------- */
-                       
+                       case 'O':                       /* output format */
+                               {
+                                       char outformat[50];
+                                       char *of = optarg;
+                                       sprintf(outformat,".%s",of);
+                                       img_fol->set_out_format = 1;
+                                       parameters->cod_format = get_file_format(outformat);
+                                       switch(parameters->cod_format) {
+                       case J2K_CFMT:
+                               img_fol->out_format = "j2k";
+                               break;
+                       case JP2_CFMT:
+                               img_fol->out_format = "jp2";
+                               break;
+                       default:
+                               fprintf(stderr, "Unknown output format image [only j2k, jp2]!! \n");
+                               return 1;
+                                       }
+                               }
+                               break;
+
+
+                               /* ----------------------------------------------------- */
+
+
                        case 'r':                       /* rates rates/distorsion */
                        {
                                char *s = optarg;
-                               while (sscanf(s, "%d", &parameters->tcp_rates[parameters->tcp_numlayers]) == 1) {
+                               while (sscanf(s, "%f", &parameters->tcp_rates[parameters->tcp_numlayers]) == 1) {
                                        parameters->tcp_numlayers++;
                                        while (*s && *s != ',') {
                                                s++;
@@ -279,9 +651,9 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                parameters->cp_disto_alloc = 1;
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
-                       
+
                        case 'q':                       /* add fixed_quality */
                        {
                                char *s = optarg;
@@ -297,7 +669,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                parameters->cp_fixed_quality = 1;
                        }
                        break;
-                               
+
                                /* dda */
                                /* ----------------------------------------------------- */
 
@@ -345,7 +717,7 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                parameters->cp_fixed_alloc = 1;
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
 
                        case 't':                       /* tiles */
@@ -354,15 +726,15 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                parameters->tile_size_on = true;
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
-                       
+
                        case 'n':                       /* resolution */
                        {
                                sscanf(optarg, "%d", &parameters->numresolution);
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
                        case 'c':                       /* precinct dimension */
                        {
@@ -372,7 +744,8 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                char *s = optarg;
                                do {
                                        sep = 0;
-                                       sscanf(s, "[%d,%d]%c", &parameters->prcw_init[res_spec], &parameters->prch_init[res_spec], &sep);
+                                       sscanf(s, "[%d,%d]%c", &parameters->prcw_init[res_spec],
+                                 &parameters->prch_init[res_spec], &sep);
                                        parameters->csty |= 0x01;
                                        res_spec++;
                                        s = strpbrk(s, "]") + 2;
@@ -381,9 +754,9 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                parameters->res_spec = res_spec;
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
-                       
+
                        case 'b':                       /* code-block dimension */
                        {
                                int cblockw_init = 0, cblockh_init = 0;
@@ -391,26 +764,27 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
                                        || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
                                        fprintf(stderr,
-                                               "!! Size of code_block error (option -b) !!\n\nRestriction :\n    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
+                                               "!! Size of code_block error (option -b) !!\n\nRestriction :\n"
+            "    * width*height<=4096\n    * 4<=width,height<= 1024\n\n");
                                        return 1;
                                }
                                parameters->cblockw_init = cblockw_init;
                                parameters->cblockh_init = cblockh_init;
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
-                       
+
                        case 'x':                       /* creation of index file */
                        {
                                char *index = optarg;
-                               strncpy(parameters->index, index, MAX_PATH);
+                               strncpy(parameters->index, index, sizeof(parameters->index)-1);
                                parameters->index_on = 1;
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
-                       
+
                        case 'p':                       /* progression order */
                        {
                                char progression[4];
@@ -418,40 +792,44 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                strncpy(progression, optarg, 4);
                                parameters->prog_order = give_progression(progression);
                                if (parameters->prog_order == -1) {
-                                       fprintf(stderr, "Unrecognized progression order [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
+                                       fprintf(stderr, "Unrecognized progression order "
+            "[LRCP, RLCP, RPCL, PCRL, CPRL] !!\n");
                                        return 1;
                                }
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
-                       
+
                        case 's':                       /* subsampling factor */
                        {
-                               if (sscanf(optarg, "%d,%d", &parameters->subsampling_dx, &parameters->subsampling_dy) != 2) {
+                               if (sscanf(optarg, "%d,%d", &parameters->subsampling_dx,
+                                    &parameters->subsampling_dy) != 2) {
                                        fprintf(stderr, "'-s' sub-sampling argument error !  [-s dx,dy]\n");
                                        return 1;
                                }
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
-                       
+
                        case 'd':                       /* coordonnate of the reference grid */
                        {
-                               if (sscanf(optarg, "%d,%d", &parameters->image_offset_x0, &parameters->image_offset_y0) != 2) {
-                                       fprintf(stderr, "-d 'coordonnate of the reference grid' argument error !! [-d x0,y0]\n");
+                               if (sscanf(optarg, "%d,%d", &parameters->image_offset_x0,
+                                    &parameters->image_offset_y0) != 2) {
+                                       fprintf(stderr, "-d 'coordonnate of the reference grid' argument "
+            "error !! [-d x0,y0]\n");
                                        return 1;
                                }
                        }
                        break;
-                               
+
                                /* ----------------------------------------------------- */
-                       
+
                        case 'h':                       /* display an help description */
                                encode_help_display();
                                return 1;
-                               
+
                                /* ----------------------------------------------------- */
 
                        case 'P':                       /* POC */
@@ -462,16 +840,11 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                char *s = optarg;
                                POC = parameters->POC;
 
-                               fprintf(stderr, "/----------------------------------\\\n");
-                               fprintf(stderr, "|  POC option not fully tested !!  |\n");
-                               fprintf(stderr, "\\----------------------------------/\n");
-                               
-                               while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%s", &POC[numpocs].tile,
+                               while (sscanf(s, "T%d=%d,%d,%d,%d,%d,%4s", &POC[numpocs].tile,
                                        &POC[numpocs].resno0, &POC[numpocs].compno0,
                                        &POC[numpocs].layno1, &POC[numpocs].resno1,
-                                       &POC[numpocs].compno1, POC[numpocs].progorder) == 7) {
-                                       POC[numpocs].prg = give_progression(POC[numpocs].progorder);
-                                       /* POC[numpocs].tile; */
+                                       &POC[numpocs].compno1, &POC[numpocs].progorder) == 7) {
+                                       POC[numpocs].prg1 = give_progression(POC[numpocs].progorder);
                                        numpocs++;
                                        while (*s && *s != '/') {
                                                s++;
@@ -484,25 +857,25 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                parameters->numpocs = numpocs;
                        }
                        break;
-                               
+
                                /* ------------------------------------------------------ */
-                               
+
                        case 'S':                       /* SOP marker */
                        {
                                parameters->csty |= 0x02;
                        }
                        break;
-                               
+
                                /* ------------------------------------------------------ */
-                       
+
                        case 'E':                       /* EPH marker */
                        {
                                parameters->csty |= 0x04;
                        }
                        break;
-                               
+
                                /* ------------------------------------------------------ */
-                       
+
                        case 'M':                       /* Mode switch pas tous au point !! */
                        {
                                int value = 0;
@@ -515,20 +888,21 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                }
                        }
                        break;
-                               
+
                                /* ------------------------------------------------------ */
-                       
+
                        case 'R':                       /* ROI */
                        {
-                               if (sscanf(optarg, "OI:c=%d,U=%d", &parameters->roi_compno, &parameters->roi_shift) != 2) {
+                               if (sscanf(optarg, "OI:c=%d,U=%d", &parameters->roi_compno,
+                                           &parameters->roi_shift) != 2) {
                                        fprintf(stderr, "ROI error !! [-ROI:c='compno',U='shift']\n");
                                        return 1;
                                }
                        }
                        break;
-                               
+
                                /* ------------------------------------------------------ */
-                       
+
                        case 'T':                       /* Tile offset */
                        {
                                if (sscanf(optarg, "%d,%d", &parameters->cp_tx0, &parameters->cp_ty0) != 2) {
@@ -537,9 +911,9 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                }
                        }
                        break;
-                               
+
                                /* ------------------------------------------------------ */
-                               
+
                        case 'C':                       /* add a comment */
                        {
                                parameters->cp_comment = (char*)malloc(strlen(optarg) + 1);
@@ -548,28 +922,428 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
                                }
                        }
                        break;
-                               
+
+
                                /* ------------------------------------------------------ */
-                       
+
                        case 'I':                       /* reversible or not */
                        {
                                parameters->irreversible = 1;
                        }
+                       break;
+
+                       /* ------------------------------------------------------ */
+                       
+                       case 'v':                       /* Tile part generation*/
+                       {
+                               parameters->tp_flag = optarg[0];
+                               parameters->tp_on = 1;
+                       }
+                       break;  
+
+                               /* ------------------------------------------------------ */
+                       
+                       case 'z':                       /* Image Directory path */
+                       {
+                               img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1);
+                               strcpy(img_fol->imgdirpath,optarg);
+                               img_fol->set_imgdir=1;
+                       }
+                       break;
+
+                               /* ------------------------------------------------------ */
+                       
+                       case 'w':                       /* Digital Cinema 2K profile compliance*/
+                       {
+                               int fps=0;
+                               sscanf(optarg,"%d",&fps);
+                               if(fps == 24){
+                                       parameters->cp_cinema = CINEMA2K_24;
+                               }else if(fps == 48 ){
+                                       parameters->cp_cinema = CINEMA2K_48;
+                               }else {
+                                       fprintf(stderr,"Incorrect value!! must be 24 or 48\n");
+                                       return 1;
+                               }
+                               fprintf(stdout,"CINEMA 2K compliant codestream\n");
+                               parameters->cp_rsiz = CINEMA2K;
+                               
+                       }
+                       break;
+                               
+                               /* ------------------------------------------------------ */
+                       
+                       case 'y':                       /* Digital Cinema 4K profile compliance*/
+                       {
+                               parameters->cp_cinema = CINEMA4K_24;
+                               fprintf(stdout,"CINEMA 4K compliant codestream\n");
+                               parameters->cp_rsiz = CINEMA4K;
+                       }
                        break;
                                
                                /* ------------------------------------------------------ */
+
+/* UniPG>> */
+#ifdef USE_JPWL
+                               /* ------------------------------------------------------ */
                        
+                       case 'W':                       /* JPWL capabilities switched on */
+                       {
+                               char *token = NULL;
+                               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;
+                               }
+
+                               /* search for different protection methods */
+
+                               /* break the option in comma points and parse the result */
+                               token = strtok(optarg, ",");
+                               while(token != NULL) {
+
+                                       /* search header error protection method */
+                                       if (*token == 'h') {
+
+                                               static int tile = 0, tilespec = 0, lasttileno = 0;
+
+                                               hprot = 1; /* predefined method */
+
+                                               if(sscanf(token, "h=%d", &hprot) == 1) {
+                                                       /* Main header, specified */
+                                                       if (!((hprot == 0) || (hprot == 1) || (hprot == 16) || (hprot == 32) ||
+                                                               ((hprot >= 37) && (hprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid main header protection method h = %d\n", hprot);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_hprot_MH = hprot;
+
+                                               } else if(sscanf(token, "h%d=%d", &tile, &hprot) == 2) {
+                                                       /* 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);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method t = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
+                                                               parameters->jpwl_hprot_TPH_tileno[tilespec] = lasttileno = tile;
+                                                               parameters->jpwl_hprot_TPH[tilespec++] = hprot;
+                                                       }
+
+                                               } 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);
+                                                               return 1;
+                                                       }
+                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
+                                                               parameters->jpwl_hprot_TPH_tileno[tilespec] = lasttileno = tile;
+                                                               parameters->jpwl_hprot_TPH[tilespec++] = hprot;
+                                                       }
+
+
+                                               } else if (!strcmp(token, "h")) {
+                                                       /* Main header, unspecified */
+                                                       parameters->jpwl_hprot_MH = hprot;
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid protection method selection = %s\n", token);
+                                                       return 1;
+                                               };
+
+                                       }
+
+                                       /* search packet error protection method */
+                                       if (*token == 'p') {
+
+                                               static int pack = 0, tile = 0, packspec = 0, lastpackno = 0;
+
+                                               pprot = 1; /* predefined method */
+
+                                               if (sscanf(token, "p=%d", &pprot) == 1) {
+                                                       /* Method for all tiles and all packets */
+                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
+                                                               ((pprot >= 37) && (pprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid default packet protection method p = %d\n", pprot);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_pprot_tileno[0] = 0;
+                                                       parameters->jpwl_pprot_packno[0] = 0;
+                                                       parameters->jpwl_pprot[0] = pprot;
+
+                                               } else if (sscanf(token, "p%d=%d", &tile, &pprot) == 2) {
+                                                       /* method specified from that tile on */
+                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
+                                                               ((pprot >= 37) && (pprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method p = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
+                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
+                                                               parameters->jpwl_pprot_packno[packspec] = 0;
+                                                               parameters->jpwl_pprot[packspec++] = pprot;
+                                                       }
+
+                                               } else if (sscanf(token, "p%d:%d=%d", &tile, &pack, &pprot) == 3) {
+                                                       /* method fully specified from that tile and that packet on */
+                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
+                                                               ((pprot >= 37) && (pprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method p = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (pack < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid packet number on protection method p = %d\n", pack);
+                                                               return 1;
+                                                       }
+                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
+                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
+                                                               parameters->jpwl_pprot_packno[packspec] = pack;
+                                                               parameters->jpwl_pprot[packspec++] = pprot;
+                                                       }
+
+                                               } else if (sscanf(token, "p%d:%d", &tile, &pack) == 2) {
+                                                       /* default method from that tile and that packet on */
+                                                       if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) ||
+                                                               ((pprot >= 37) && (pprot <= 128)))) {
+                                                               fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile number on protection method p = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (pack < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid packet number on protection method p = %d\n", pack);
+                                                               return 1;
+                                                       }
+                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
+                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
+                                                               parameters->jpwl_pprot_packno[packspec] = pack;
+                                                               parameters->jpwl_pprot[packspec++] = pprot;
+                                                       }
+
+                                               } 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);
+                                                               return 1;
+                                                       }
+                                                       if (packspec < JPWL_MAX_NO_PACKSPECS) {
+                                                               parameters->jpwl_pprot_tileno[packspec] = tile;
+                                                               parameters->jpwl_pprot_packno[packspec] = 0;
+                                                               parameters->jpwl_pprot[packspec++] = pprot;
+                                                       }
+
+
+                                               } else if (!strcmp(token, "p")) {
+                                                       /* all default */
+                                                       parameters->jpwl_pprot_tileno[0] = 0;
+                                                       parameters->jpwl_pprot_packno[0] = 0;
+                                                       parameters->jpwl_pprot[0] = pprot;
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid protection method selection = %s\n", token);
+                                                       return 1;
+                                               };
+
+                                       }
+
+                                       /* search sensitivity method */
+                                       if (*token == 's') {
+
+                                               static int tile = 0, tilespec = 0, lasttileno = 0;
+
+                                               sens = 0; /* predefined: relative error */
+
+                                               if(sscanf(token, "s=%d", &sens) == 1) {
+                                                       /* Main header, specified */
+                                                       if ((sens < -1) || (sens > 7)) {
+                                                               fprintf(stderr, "ERROR -> invalid main header sensitivity method s = %d\n", sens);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_sens_MH = sens;
+
+                                               } 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);
+                                                               return 1;
+                                                       }
+                                                       if (tile < 0) {
+                                                               fprintf(stderr, "ERROR -> invalid tile number on sensitivity method t = %d\n", tile);
+                                                               return 1;
+                                                       }
+                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
+                                                               parameters->jpwl_sens_TPH_tileno[tilespec] = lasttileno = tile;
+                                                               parameters->jpwl_sens_TPH[tilespec++] = sens;
+                                                       }
+
+                                               } 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);
+                                                               return 1;
+                                                       }
+                                                       if (tilespec < JPWL_MAX_NO_TILESPECS) {
+                                                               parameters->jpwl_sens_TPH_tileno[tilespec] = lasttileno = tile;
+                                                               parameters->jpwl_sens_TPH[tilespec++] = hprot;
+                                                       }
+
+                                               } else if (!strcmp(token, "s")) {
+                                                       /* Main header, unspecified */
+                                                       parameters->jpwl_sens_MH = sens;
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid sensitivity method selection = %s\n", token);
+                                                       return 1;
+                                               };
+                                               
+                                               parameters->jpwl_sens_size = 2; /* 2 bytes for default size */
+                                       }
+
+                                       /* search addressing size */
+                                       if (*token == 'a') {
+
+                                               static int tile = 0, tilespec = 0, lasttileno = 0;
+
+                                               addr = 0; /* predefined: auto */
+
+                                               if(sscanf(token, "a=%d", &addr) == 1) {
+                                                       /* Specified */
+                                                       if ((addr != 0) && (addr != 2) && (addr != 4)) {
+                                                               fprintf(stderr, "ERROR -> invalid addressing size a = %d\n", addr);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_sens_addr = addr;
+
+                                               } else if (!strcmp(token, "a")) {
+                                                       /* default */
+                                                       parameters->jpwl_sens_addr = addr; /* auto for default size */
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid addressing selection = %s\n", token);
+                                                       return 1;
+                                               };
+                                               
+                                       }
+
+                                       /* search sensitivity size */
+                                       if (*token == 'z') {
+
+                                               static int tile = 0, tilespec = 0, lasttileno = 0;
+
+                                               size = 1; /* predefined: 1 byte */
+
+                                               if(sscanf(token, "z=%d", &size) == 1) {
+                                                       /* Specified */
+                                                       if ((size != 0) && (size != 1) && (size != 2)) {
+                                                               fprintf(stderr, "ERROR -> invalid sensitivity size z = %d\n", size);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_sens_size = size;
+
+                                               } else if (!strcmp(token, "a")) {
+                                                       /* default */
+                                                       parameters->jpwl_sens_size = size; /* 1 for default size */
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid size selection = %s\n", token);
+                                                       return 1;
+                                               };
+                                               
+                                       }
+
+                                       /* search range method */
+                                       if (*token == 'g') {
+
+                                               static int tile = 0, tilespec = 0, lasttileno = 0;
+
+                                               range = 0; /* predefined: 0 (packet) */
+
+                                               if(sscanf(token, "g=%d", &range) == 1) {
+                                                       /* Specified */
+                                                       if ((range < 0) || (range > 3)) {
+                                                               fprintf(stderr, "ERROR -> invalid sensitivity range method g = %d\n", range);
+                                                               return 1;
+                                                       }
+                                                       parameters->jpwl_sens_range = range;
+
+                                               } else if (!strcmp(token, "g")) {
+                                                       /* default */
+                                                       parameters->jpwl_sens_range = range;
+
+                                               } else {
+                                                       fprintf(stderr, "ERROR -> invalid range selection = %s\n", token);
+                                                       return 1;
+                                               };
+                                               
+                                       }
+
+                                       /* next token or bust */
+                                       token = strtok(NULL, ",");
+                               };
+
+
+                               /* some info */
+                               fprintf(stdout, "Info: JPWL capabilities enabled\n");
+                               parameters->jpwl_epc_on = true;
+
+                       }
+                       break;
+#endif /* USE_JPWL */
+/* <<UniPG */
+
+                               /* ------------------------------------------------------ */
+
                        default:
-                               fprintf(stderr, "ERROR -> this option is not valid \"-%c %s\"\n", c, optarg);
+                               fprintf(stderr, "ERROR -> Command line not valid\n");
                                return 1;
                }
        }
 
        /* check for possible errors */
-
-       if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
-               fprintf(stderr, "usage: image_to_j2k -i image-file -o j2k/jp2-file (+ options)\n");
-               return 1;
+       if (parameters->cp_cinema){
+               if(parameters->tcp_numlayers > 1){
+                       parameters->cp_rsiz = STD_RSIZ;
+       fprintf(stdout,"Warning: DC profiles do not allow more than one quality layer. The codestream created will not be compliant with the DC profile\n");
+               }
+       }
+       if(img_fol->set_imgdir == 1){
+               if(!(parameters->infile[0] == 0)){
+                       fprintf(stderr, "Error: options -ImgDir and -i cannot be used together !!\n");
+                       return 1;
+               }
+               if(img_fol->set_out_format == 0){
+                       fprintf(stderr, "Error: When -ImgDir is used, -OutFor <FORMAT> must be used !!\n");
+                       fprintf(stderr, "Only one format allowed! Valid formats are j2k and jp2!!\n");
+                       return 1;
+               }
+               if(!((parameters->outfile[0] == 0))){
+                       fprintf(stderr, "Error: options -ImgDir and -o cannot be used together !!\n");
+                       fprintf(stderr, "Specify OutputFormat using -OutFor<FORMAT> !!\n");
+                       return 1;
+               }
+       }else{
+               if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) {
+                       fprintf(stderr, "Error: One of the options; -i or -ImgDir must be specified\n");
+                       fprintf(stderr, "Error: When using -i; -o must be used\n");
+                       fprintf(stderr, "usage: image_to_j2k -i image-file -o j2k/jp2-file (+ options)\n");
+                       return 1;
+               }
        }
 
        if ((parameters->cp_disto_alloc || parameters->cp_fixed_alloc || parameters->cp_fixed_quality)
@@ -632,12 +1406,16 @@ void info_callback(const char *msg, void *client_data) {
 int main(int argc, char **argv) {
        bool bSuccess;
        opj_cparameters_t parameters;   /* compression parameters */
+       img_fol_t img_fol;
        opj_event_mgr_t event_mgr;              /* event manager */
        opj_image_t *image = NULL;
+       int i,num_images;
+       int imageno;
+       dircnt_t *dirptr;
 
-       /* 
+       /*
        configure the event callbacks (not required)
-       setting of each callback is optionnal 
+       setting of each callback is optionnal
        */
        memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
        event_mgr.error_handler = error_callback;
@@ -648,141 +1426,227 @@ int main(int argc, char **argv) {
        opj_set_default_encoder_parameters(&parameters);
 
        /* parse input and get user encoding parameters */
-       if(parse_cmdline_encoder(argc, argv, &parameters) == 1) {
+       if(parse_cmdline_encoder(argc, argv, &parameters,&img_fol) == 1) {
                return 0;
        }
+       
+       if (parameters.cp_cinema){
+               cinema_parameters(&parameters);
+       }
+                               
 
+       /* Create comment for codestream */
        if(parameters.cp_comment == NULL) {
-    const char comment[] = "Created by OpenJPEG version 1.0";
-               parameters.cp_comment = (char*)malloc(strlen(comment)+1);
-    strcpy(parameters.cp_comment, comment);
+    const char comment[] = "Created by OpenJPEG version ";
+               const size_t clen = strlen(comment);
+    const char *version = opj_version();
+/* UniPG>> */
+#ifdef USE_JPWL
+               parameters.cp_comment = (char*)malloc(clen+strlen(version)+11);
+               sprintf(parameters.cp_comment,"%s%s with JPWL", comment, version);
+#else
+               parameters.cp_comment = (char*)malloc(clen+strlen(version)+1);
+               sprintf(parameters.cp_comment,"%s%s", comment, version);
+#endif
+/* <<UniPG */
+
        }
 
-       /* decode the source image */
-       /* ----------------------- */
+       /* Read directory if necessary */
 
-       switch (parameters.decod_format) {
-               case PGX_DFMT:
-                       image = pgxtoimage(parameters.infile, &parameters);
-                       if (!image) {
-                               fprintf(stderr, " unable to load pgx file\n");
-                               return 1;
+       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;
                        }
-                       break;
-               
-               case PXM_DFMT:
-                       image = pnmtoimage(parameters.infile, &parameters);
-                       if (!image) {
-                               fprintf(stderr, " not a pnm file\n");
-                               return 1;
+                       for(i=0;i<num_images;i++){
+                               dirptr->filename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN;
                        }
-                       break;
+               }
+               if(load_images(dirptr,img_fol.imgdirpath)==1){
+                       return 0;
+               }
+               if (num_images==0){
+                       fprintf(stdout,"Folder is empty\n");
+                       return 0;
+               }
+       }else{
+               num_images=1;
+       }
+       /*Encoding image one by one*/
+       for(imageno=0;imageno<num_images;imageno++)
+       {
 
-               case BMP_DFMT:
-                       image = bmptoimage(parameters.infile, &parameters);
-                       if (!image) {
-                               fprintf(stderr, " not a bmp file\n");
-                               return 1;
+               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");
+                               continue;
                        }
-                       break;
-       }
+               }
+               switch(parameters.decod_format) {
+                       case PGX_DFMT:
+                               break;
+                       case PXM_DFMT:
+                               break;
+                       case BMP_DFMT:
+                               break;
+                       case TIF_DFMT:
+                               break;
+               
+                       default:
+                               fprintf(stderr,"skipping file...\n");
+                               continue;                       
+               }
 
-       /* encode the destination image */
-       /* ---------------------------- */
+                       /* decode the source image */
+                       /* ----------------------- */
 
-       if (parameters.cod_format == J2K_CFMT) {        /* J2K format output */
-               int codestream_length;
-               opj_cio_t *cio = NULL;
-               FILE *f = NULL;
+                       switch (parameters.decod_format) {
+                               case PGX_DFMT:
+                                       image = pgxtoimage(parameters.infile, &parameters);
+                                       if (!image) {
+                                               fprintf(stderr, "Unable to load pgx file\n");
+                                               return 1; 
+                                       }
+                                       break;
 
-               /* get a J2K compressor handle */
-               opj_cinfo_t* cinfo = opj_create_compress(CODEC_J2K);
+                               case PXM_DFMT:
+                                       image = pnmtoimage(parameters.infile, &parameters);
+                                       if (!image) {
+                                               fprintf(stderr, "Unable to load pnm file\n");
+                                               return 1;
+                                       }
+                                       break;
 
-               /* catch events using our callbacks and give a local context */
-               opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);                   
+                               case BMP_DFMT:
+                                       image = bmptoimage(parameters.infile, &parameters);
+                                       if (!image) {
+                                               fprintf(stderr, "Unable to load bmp file\n");
+                                               return 1;
+                                       }
+                                       break;
+                       
+                               case TIF_DFMT:
+                                       image = tiftoimage(parameters.infile, &parameters);
+                                       if (!image) {
+                                               fprintf(stderr, "Unable to load tiff file\n");
+                                               return 1;
+                                       }
+                               break;
+               }
 
-               /* setup the encoder parameters using the current image and using user parameters */
-               opj_setup_encoder(cinfo, &parameters, image);
+                       if(parameters.cp_cinema){
+                               cinema_setup_encoder(&parameters,image);
+                       }
 
-               /* open a byte stream for writing */
-               /* allocate memory for all tiles */
-               cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
+                       /* encode the destination image */
+                       /* ---------------------------- */
 
-               /* encode the image */
-               bSuccess = opj_encode(cinfo, cio, image, parameters.index);
-               if (!bSuccess) {
-                       opj_cio_close(cio);
-                       fprintf(stderr, "failed to encode image\n");
-                       return 1;
-               }
-               codestream_length = cio_tell(cio);
+                       if (parameters.cod_format == J2K_CFMT) {        /* J2K format output */
+                               int codestream_length;
+                               opj_cio_t *cio = NULL;
+                               FILE *f = NULL;
 
-               /* write the buffer to disk */
-               f = fopen(parameters.outfile, "wb");
-               if (!f) {
-                       fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
-                       return 1;
-               }
-               fwrite(cio->buffer, 1, codestream_length, f);
-               fclose(f);
+                               /* get a J2K compressor handle */
+                               opj_cinfo_t* cinfo = opj_create_compress(CODEC_J2K);
 
-               /* close and free the byte stream */
-               opj_cio_close(cio);
+                               /* catch events using our callbacks and give a local context */
+                               opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);
 
-               /* free remaining compression structures */
-               opj_destroy_compress(cinfo);
+                               /* setup the encoder parameters using the current image and user parameters */
+                               opj_setup_encoder(cinfo, &parameters, image);
 
-       } else {                        /* JP2 format output */
-               int codestream_length;
-               opj_cio_t *cio = NULL;
-               FILE *f = NULL;
+                               /* open a byte stream for writing */
+                               /* allocate memory for all tiles */
+                               cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
 
-               /* get a JP2 compressor handle */
-               opj_cinfo_t* cinfo = opj_create_compress(CODEC_JP2);
+                               /* encode the image */
+                               bSuccess = opj_encode(cinfo, cio, image, parameters.index);
+                               if (!bSuccess) {
+                                       opj_cio_close(cio);
+                                       fprintf(stderr, "failed to encode image\n");
+                                       return 1;
+                               }
+                               codestream_length = cio_tell(cio);
 
-               /* catch events using our callbacks and give a local context */
-               opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);                   
+                               /* write the buffer to disk */
+                               f = fopen(parameters.outfile, "wb");
+                               if (!f) {
+                                       fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
+                                       return 1;
+                               }
+                               fwrite(cio->buffer, 1, codestream_length, f);
+                               fclose(f);
 
-               /* setup the encoder parameters using the current image and using user parameters */
-               opj_setup_encoder(cinfo, &parameters, image);
+                               fprintf(stderr,"Generated outfile %s\n",parameters.outfile);
+                               /* close and free the byte stream */
+                               opj_cio_close(cio);
 
-               /* open a byte stream for writing */
-               /* allocate memory for all tiles */
-               cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
+                               /* free remaining compression structures */
+                               opj_destroy_compress(cinfo);
 
-               /* encode the image */
-               bSuccess = opj_encode(cinfo, cio, image, parameters.index);
-               if (!bSuccess) {
-                       opj_cio_close(cio);
-                       fprintf(stderr, "failed to encode image\n");
-                       return 1;
-               }
-               codestream_length = cio_tell(cio);
+                       } else {                        /* JP2 format output */
+                               int codestream_length;
+                               opj_cio_t *cio = NULL;
+                               FILE *f = NULL;
 
-               /* write the buffer to disk */
-               f = fopen(parameters.outfile, "wb");
-               if (!f) {
-                       fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
-                       return 1;
-               }
-               fwrite(cio->buffer, 1, codestream_length, f);
-               fclose(f);
+                               /* get a JP2 compressor handle */
+                               opj_cinfo_t* cinfo = opj_create_compress(CODEC_JP2);
 
-               /* close and free the byte stream */
-               opj_cio_close(cio);
+                               /* catch events using our callbacks and give a local context */
+                               opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, stderr);                   
 
-               /* free remaining compression structures */
-               opj_destroy_compress(cinfo);
+                               /* setup the encoder parameters using the current image and using user parameters */
+                               opj_setup_encoder(cinfo, &parameters, image);
 
+                               /* open a byte stream for writing */
+                               /* allocate memory for all tiles */
+                               cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0);
+
+                               /* encode the image */
+                               bSuccess = opj_encode(cinfo, cio, image, parameters.index);
+                               if (!bSuccess) {
+                                       opj_cio_close(cio);
+                                       fprintf(stderr, "failed to encode image\n");
+                                       return 1;
+                               }
+                               codestream_length = cio_tell(cio);
+
+                               /* write the buffer to disk */
+                               f = fopen(parameters.outfile, "wb");
+                               if (!f) {
+                                       fprintf(stderr, "failed to open %s for writing\n", parameters.outfile);
+                                       return 1;
+                               }
+                               fwrite(cio->buffer, 1, codestream_length, f);
+                               fclose(f);
+                               fprintf(stderr,"Generated outfile %s\n",parameters.outfile);
+                               /* close and free the byte stream */
+                               opj_cio_close(cio);
+
+                               /* free remaining compression structures */
+                               opj_destroy_compress(cinfo);
+
+                       }
+       
+                       /* free image data */
+                       opj_image_destroy(image);
        }
 
        /* free user parameters structure */
   if(parameters.cp_comment) free(parameters.cp_comment);
        if(parameters.cp_matrice) free(parameters.cp_matrice);
 
-       /* free image data */
-       opj_image_destroy(image);
-
        return 0;
 }