From 9832c911b36f25f228e391c6da876f79b664af0e Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Mon, 8 Oct 2012 15:59:17 +0000 Subject: [PATCH] [trunk] Update JPIP (FolderReorgProposal task) This commit does three things: - Use opj_malloc/calloc/free instead of the default C ones. - Update JPIP API to start using cio _v2 API - Create a new opj_jpip_compress which is the replacement for image_to_j2k -jpip Update issue 177 --- src/bin/jpip/CMakeLists.txt | 16 +- src/bin/jpip/opj_jpip_compress.c | 1896 ++++++++++++++++++++++ src/lib/openjp2/jp2.h | 1 + src/lib/openjpip/cachemodel_manager.c | 24 +- src/lib/openjpip/channel_manager.c | 10 +- src/lib/openjpip/cidx_manager.c | 260 ++- src/lib/openjpip/dec_clientmsg_handler.c | 40 +- src/lib/openjpip/index_manager.c | 74 +- src/lib/openjpip/index_manager.h | 7 +- src/lib/openjpip/j2kheader_manager.c | 8 +- src/lib/openjpip/jp2k_encoder.c | 38 +- src/lib/openjpip/jpipstream_manager.c | 12 +- src/lib/openjpip/msgqueue_manager.c | 28 +- src/lib/openjpip/openjpip.c | 765 ++++++++- src/lib/openjpip/openjpip.h | 2 + src/lib/openjpip/phix_manager.c | 181 +++ src/lib/openjpip/ppix_manager.c | 182 +++ src/lib/openjpip/session_manager.c | 10 +- src/lib/openjpip/target_manager.c | 18 +- src/lib/openjpip/thix_manager.c | 124 ++ src/lib/openjpip/tpix_manager.c | 168 +- 21 files changed, 3701 insertions(+), 163 deletions(-) create mode 100644 src/bin/jpip/opj_jpip_compress.c diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt index f1433887..09d6f98c 100644 --- a/src/bin/jpip/CMakeLists.txt +++ b/src/bin/jpip/CMakeLists.txt @@ -2,6 +2,8 @@ include_directories( ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 + ${OPENJPEG_SOURCE_DIR}/src/bin/common # opj_getopt.h + ${OPENJPEG_SOURCE_DIR}/src/bin/jp2 # convert.h ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip ${FCGI_INCLUDE_DIRS} ) @@ -15,7 +17,6 @@ install(TARGETS opj_jpip_addxml ) if(BUILD_JPIP_SERVER) - set(OPJ_SERVER_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/opj_server.c ) @@ -45,9 +46,20 @@ set(EXES opj_dec_server opj_jpip_transcode opj_jpip_test + opj_jpip_compress ) foreach(exe ${EXES}) - add_executable(${exe} ${exe}.c) + if(${exe} STREQUAL "opj_jpip_compress") + add_executable(${exe} ${exe}.c + ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c + ${OPENJPEG_SOURCE_DIR}/src/bin/jp2/convert.c + ) + target_link_libraries(${exe} + ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME} + ) + else() + add_executable(${exe} ${exe}.c) + endif() target_link_libraries(${exe} openjpip) install(TARGETS ${exe} EXPORT OpenJPEGTargets diff --git a/src/bin/jpip/opj_jpip_compress.c b/src/bin/jpip/opj_jpip_compress.c new file mode 100644 index 00000000..1b230744 --- /dev/null +++ b/src/bin/jpip/opj_jpip_compress.c @@ -0,0 +1,1896 @@ +/* + * 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-2007, Francois-Olivier Devaux and Antonin Descampe + * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2006-2007, Parvatha Elangovan + * Copyright (c) 2008, Jerome Fimes, Communications & Systemes + * Copyright (c) 2012, Mathieu Malaterre + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include + +#ifdef _WIN32 +#include "windirent.h" +#else +#include +#endif /* _WIN32 */ + +#ifdef _WIN32 +#include +#define strcasecmp _stricmp +#define strncasecmp _strnicmp +#else +#include +#endif /* _WIN32 */ + +#include "opj_config.h" +#include "openjpeg.h" +#include "opj_getopt.h" +#include "convert.h" +#include "index.h" + +#include "format_defs.h" + +#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; + /** User specified rate stored in case of cinema option*/ + float *rates; +}img_fol_t; + +void encode_help_display(void) { + fprintf(stdout,"HELP for image_to_j2k\n----\n\n"); + fprintf(stdout,"- the -h option displays this help information on screen\n\n"); + +/* UniPG>> */ + fprintf(stdout,"List of parameters for the JPEG 2000 " +#ifdef USE_JPWL + "+ JPWL " +#endif /* USE_JPWL */ + "encoder:\n"); +/* <> */ +#ifdef USE_JPWL + fprintf(stdout," * No JPWL protection\n"); +#endif /* USE_JPWL */ +/* < \n"); + fprintf(stdout," Currently accepts PBM, PGM, PPM, PNM, PAM, PGX, PNG, BMP, TIF, RAW, RAWL and TGA formats\n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-i : source file (-i source.pnm also *pbm, *.pgm, *.ppm, *.pam, *.pgx, *png, *.bmp, *.tif, *.raw, *.tga) \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"); + fprintf(stdout,"Optional Parameters:\n"); + 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"); + fprintf(stdout," Example: -r 20,10,1 means quality 1: compress 20x, \n"); + fprintf(stdout," quality 2: compress 10x and quality 3: compress lossless\n"); + fprintf(stdout,"\n"); + fprintf(stdout," (options -r and -q cannot be used together)\n "); + fprintf(stdout,"\n"); + + fprintf(stdout,"-q : different psnr for successive layers (-q 30,40,50) \n "); + + fprintf(stdout," (options -r and -q cannot be used together)\n "); + + fprintf(stdout,"\n"); + fprintf(stdout,"-n : number of resolutions (-n 3) \n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-b : size of code block (-b 32,32) \n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-c : size of precinct (-c 128,128) \n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-t : size of tile (-t 512,512) \n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-p : progression order (-p LRCP) [LRCP, RLCP, RPCL, PCRL, CPRL] \n"); + fprintf(stdout,"\n"); + 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"); + fprintf(stdout,"\n"); + fprintf(stdout,"-M : mode switch (-M 3) [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL)\n"); + fprintf(stdout," 8=VSC 16=ERTERM(SEGTERM) 32=SEGMARK(SEGSYM)] \n"); + fprintf(stdout," Indicate multiple modes by adding their values. \n"); + fprintf(stdout," ex: RESTART(4) + RESET(2) + SEGMARK(32) = -M 38\n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-TP : devide packets of every tile into tile-parts (-TP R) [R, L, C]\n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-x : create an index file *.Idx (-x index_name.Idx) \n"); + 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,"\n"); + fprintf(stdout,"-d : offset of the origin of the image (-d 150,300) \n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-T : offset of the origin of the tiles (-T 100,75) \n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-I : use the irreversible DWT 9-7 (-I) \n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-F : characteristics of the raw input image\n"); + fprintf(stdout," -F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n"); + fprintf(stdout," Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-m : use array-based MCT, values are coma separated, line by line\n"); + fprintf(stdout," no specific separators between lines, no space allowed between values\n"); + fprintf(stdout,"-jpip : write jpip codestream index box in JP2 output file\n"); + fprintf(stdout," NOTICE: currently supports only RPCL order\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<=type>,s<=method>,a=,...\n"); + fprintf(stdout," ...,z=,g=,p<=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 '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 '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 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 '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: 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: 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: 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,\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 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"); + 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 */ +/* <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", "pbm", "pam", "bmp", "tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "j2c", "jpc" + }; + static const int format[] = { + PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT + }; + char * ext = strrchr(filename, '.'); + if (ext == NULL) + return -1; + ext++; + for(i = 0; i < sizeof(format)/sizeof(*format); i++) { + if(strcasecmp(ext, extension[i]) == 0) { + return format[i]; + } + } + 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]; + char *temp_p, temp1[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)); + 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)); + } + 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 = OPJ_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; + + /* 9-7 transform */ + parameters->irreversible = 1; + +} + +void cinema_setup_encoder(opj_cparameters_t *parameters,opj_image_t *image, img_fol_t *img_fol){ + int i; + float temp_rate; + + 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.\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; + } + 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.\nJPEG Digital Cinema Profile-4" + "(4K profile) compliance requires that at least 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; + default : + break; + } + + switch (parameters->cp_cinema){ + case CINEMA2K_24: + case CINEMA4K_24: + for(i=0 ; itcp_numlayers ; i++){ + temp_rate = 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))/ + (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); + }else{ + parameters->tcp_rates[i]= img_fol->rates[i]; + } + } + } + parameters->max_comp_size = COMP_24_CS; + break; + + case CINEMA2K_48: + for(i=0 ; itcp_numlayers ; i++){ + temp_rate = 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))/ + (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); + }else{ + parameters->tcp_rates[i]= img_fol->rates[i]; + } + } + } + parameters->max_comp_size = COMP_48_CS; + break; + default: + break; + } + parameters->cp_disto_alloc = 1; +} + +/* ------------------------------------------------------------------------------------ */ + +int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, + img_fol_t *img_fol, raw_cparameters_t *raw_cp, char *indexfilename) { + int i, j, totlen, c; + opj_option_t long_option[]={ + {"cinema2K",REQ_ARG, NULL ,'w'}, + {"cinema4K",NO_ARG, NULL ,'y'}, + {"ImgDir",REQ_ARG, NULL ,'z'}, + {"TP",REQ_ARG, NULL ,'u'}, + {"SOP",NO_ARG, NULL ,'S'}, + {"EPH",NO_ARG, NULL ,'E'}, + {"OutFor",REQ_ARG, NULL ,'O'}, + {"POC",REQ_ARG, NULL ,'P'}, + {"ROI",REQ_ARG, NULL ,'R'}, + {"jpip",NO_ARG, NULL, 'J'} + }; + + /* parse the command line */ + const char optlist[] = "i:o:r:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:u:J" +#ifdef USE_JPWL + "W:" +#endif /* USE_JPWL */ + "h"; + + totlen=sizeof(long_option); + img_fol->set_out_format=0; + raw_cp->rawWidth = 0; + + do{ + c = opj_getopt_long(argc, argv, optlist,long_option,totlen); + if (c == -1) + break; + switch (c) { + case 'i': /* input file */ + { + char *infile = opj_optarg; + parameters->decod_format = get_file_format(infile); + switch(parameters->decod_format) { + case PGX_DFMT: + case PXM_DFMT: + case BMP_DFMT: + case TIF_DFMT: + case RAW_DFMT: + case RAWL_DFMT: + case TGA_DFMT: + case PNG_DFMT: + break; + default: + fprintf(stderr, + "!! Unrecognized format for infile : %s " + "[accept only *.pnm, *.pgm, *.ppm, *.pgx, *png, *.bmp, *.tif, *.raw or *.tga] !!\n\n", + infile); + return 1; + } + strncpy(parameters->infile, infile, sizeof(parameters->infile)-1); + } + break; + + /* ----------------------------------------------------- */ + + case 'o': /* output file */ + { + char *outfile = opj_optarg; + parameters->cod_format = get_file_format(outfile); + switch(parameters->cod_format) { + case J2K_CFMT: + case JP2_CFMT: + break; + default: + fprintf(stderr, "Unknown output format image %s [only *.j2k, *.j2c or *.jp2]!! \n", outfile); + return 1; + } + strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1); + } + break; + + /* ----------------------------------------------------- */ + case 'O': /* output format */ + { + char outformat[50]; + char *of = opj_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: + case JP2_CFMT: + img_fol->out_format = opj_optarg; + break; + default: + fprintf(stderr, "Unknown output format image [only j2k, j2c, jp2]!! \n"); + return 1; + } + } + break; + + + /* ----------------------------------------------------- */ + + + case 'r': /* rates rates/distorsion */ + { + char *s = opj_optarg; + parameters->tcp_numlayers = 0; + while (sscanf(s, "%f", ¶meters->tcp_rates[parameters->tcp_numlayers]) == 1) { + parameters->tcp_numlayers++; + while (*s && *s != ',') { + s++; + } + if (!*s) + break; + s++; + } + parameters->cp_disto_alloc = 1; + } + break; + + /* ----------------------------------------------------- */ + + + case 'F': /* Raw image format parameters */ + { + char signo; + char *s = opj_optarg; + if (sscanf(s, "%d,%d,%d,%d,%c", &raw_cp->rawWidth, &raw_cp->rawHeight, &raw_cp->rawComp, &raw_cp->rawBitDepth, &signo) == 5) { + if (signo == 's') { + raw_cp->rawSigned = OPJ_TRUE; + fprintf(stdout,"\nRaw file parameters: %d,%d,%d,%d Signed\n", raw_cp->rawWidth, raw_cp->rawHeight, raw_cp->rawComp, raw_cp->rawBitDepth); + } + else if (signo == 'u') { + raw_cp->rawSigned = OPJ_FALSE; + fprintf(stdout,"\nRaw file parameters: %d,%d,%d,%d Unsigned\n", raw_cp->rawWidth, raw_cp->rawHeight, raw_cp->rawComp, raw_cp->rawBitDepth); + } + else { + fprintf(stderr,"\nError: invalid raw image parameters: Unknown sign of raw file\n"); + fprintf(stderr,"Please use the Format option -F:\n"); + fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n"); + fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n"); + fprintf(stderr,"Aborting\n"); + } + } + else { + fprintf(stderr,"\nError: invalid raw image parameters\n"); + fprintf(stderr,"Please use the Format option -F:\n"); + fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n"); + fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n"); + fprintf(stderr,"Aborting\n"); + return 1; + } + } + break; + + /* ----------------------------------------------------- */ + + case 'q': /* add fixed_quality */ + { + char *s = opj_optarg; + while (sscanf(s, "%f", ¶meters->tcp_distoratio[parameters->tcp_numlayers]) == 1) { + parameters->tcp_numlayers++; + while (*s && *s != ',') { + s++; + } + if (!*s) + break; + s++; + } + parameters->cp_fixed_quality = 1; + } + break; + + /* dda */ + /* ----------------------------------------------------- */ + + case 'f': /* mod fixed_quality (before : -q) */ + { + int *row = NULL, *col = NULL; + int numlayers = 0, numresolution = 0, matrix_width = 0; + + char *s = opj_optarg; + sscanf(s, "%d", &numlayers); + s++; + if (numlayers > 9) + s++; + + parameters->tcp_numlayers = numlayers; + numresolution = parameters->numresolution; + matrix_width = numresolution * 3; + parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int)); + s = s + 2; + + for (i = 0; i < numlayers; i++) { + row = ¶meters->cp_matrice[i * matrix_width]; + col = row; + parameters->tcp_rates[i] = 1; + sscanf(s, "%d,", &col[0]); + s += 2; + if (col[0] > 9) + s++; + col[1] = 0; + col[2] = 0; + for (j = 1; j < numresolution; j++) { + col += 3; + sscanf(s, "%d,%d,%d", &col[0], &col[1], &col[2]); + s += 6; + if (col[0] > 9) + s++; + if (col[1] > 9) + s++; + if (col[2] > 9) + s++; + } + if (i < numlayers - 1) + s++; + } + parameters->cp_fixed_alloc = 1; + } + break; + + /* ----------------------------------------------------- */ + + case 't': /* tiles */ + { + sscanf(opj_optarg, "%d,%d", ¶meters->cp_tdx, ¶meters->cp_tdy); + parameters->tile_size_on = OPJ_TRUE; + } + break; + + /* ----------------------------------------------------- */ + + case 'n': /* resolution */ + { + sscanf(opj_optarg, "%d", ¶meters->numresolution); + } + break; + + /* ----------------------------------------------------- */ + case 'c': /* precinct dimension */ + { + char sep; + int res_spec = 0; + + char *s = opj_optarg; + do { + sep = 0; + sscanf(s, "[%d,%d]%c", ¶meters->prcw_init[res_spec], + ¶meters->prch_init[res_spec], &sep); + parameters->csty |= 0x01; + res_spec++; + s = strpbrk(s, "]") + 2; + } + while (sep == ','); + parameters->res_spec = res_spec; + } + break; + + /* ----------------------------------------------------- */ + + case 'b': /* code-block dimension */ + { + int cblockw_init = 0, cblockh_init = 0; + sscanf(opj_optarg, "%d,%d", &cblockw_init, &cblockh_init); + 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"); + return 1; + } + parameters->cblockw_init = cblockw_init; + parameters->cblockh_init = cblockh_init; + } + break; + + /* ----------------------------------------------------- */ + + case 'x': /* creation of index file */ + { + char *index = opj_optarg; + strncpy(indexfilename, index, OPJ_PATH_LEN); + } + break; + + /* ----------------------------------------------------- */ + + case 'p': /* progression order */ + { + char progression[4]; + + strncpy(progression, opj_optarg, 4); + parameters->prog_order = give_progression(progression); + if (parameters->prog_order == -1) { + fprintf(stderr, "Unrecognized progression order " + "[LRCP, RLCP, RPCL, PCRL, CPRL] !!\n"); + return 1; + } + } + break; + + /* ----------------------------------------------------- */ + + case 's': /* subsampling factor */ + { + if (sscanf(opj_optarg, "%d,%d", ¶meters->subsampling_dx, + ¶meters->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(opj_optarg, "%d,%d", ¶meters->image_offset_x0, + ¶meters->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 */ + { + int numpocs = 0; /* number of progression order change (POC) default 0 */ + opj_poc_t *POC = NULL; /* POC : used in case of Progression order change */ + + char *s = opj_optarg; + POC = parameters->POC; + + 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].prg1 = give_progression(POC[numpocs].progorder); + numpocs++; + while (*s && *s != '/') { + s++; + } + if (!*s) { + break; + } + s++; + } + 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; + if (sscanf(opj_optarg, "%d", &value) == 1) { + for (i = 0; i <= 5; i++) { + int cache = value & (1 << i); + if (cache) + parameters->mode |= (1 << i); + } + } + } + break; + + /* ------------------------------------------------------ */ + + case 'R': /* ROI */ + { + if (sscanf(opj_optarg, "c=%d,U=%d", ¶meters->roi_compno, + ¶meters->roi_shift) != 2) { + fprintf(stderr, "ROI error !! [-ROI c='compno',U='shift']\n"); + return 1; + } + } + break; + + /* ------------------------------------------------------ */ + + case 'T': /* Tile offset */ + { + if (sscanf(opj_optarg, "%d,%d", ¶meters->cp_tx0, ¶meters->cp_ty0) != 2) { + fprintf(stderr, "-T 'tile offset' argument error !! [-T X0,Y0]"); + return 1; + } + } + break; + + /* ------------------------------------------------------ */ + + case 'C': /* add a comment */ + { + parameters->cp_comment = (char*)malloc(strlen(opj_optarg) + 1); + if(parameters->cp_comment) { + strcpy(parameters->cp_comment, opj_optarg); + } + } + break; + + + /* ------------------------------------------------------ */ + + case 'I': /* reversible or not */ + { + parameters->irreversible = 1; + } + break; + + /* ------------------------------------------------------ */ + + case 'u': /* Tile part generation*/ + { + parameters->tp_flag = opj_optarg[0]; + parameters->tp_on = 1; + } + break; + + /* ------------------------------------------------------ */ + + case 'z': /* Image Directory path */ + { + img_fol->imgdirpath = (char*)malloc(strlen(opj_optarg) + 1); + strcpy(img_fol->imgdirpath,opj_optarg); + img_fol->set_imgdir=1; + } + break; + + /* ------------------------------------------------------ */ + + case 'w': /* Digital Cinema 2K profile compliance*/ + { + int fps=0; + sscanf(opj_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; + + /* ------------------------------------------------------ */ + case 'm': /* mct input file */ + { + char *lFilename = opj_optarg; + char *lMatrix; + char *lCurrentPtr ; + float *lCurrentDoublePtr; + float *lSpace; + int *l_int_ptr; + int lNbComp = 0, lTotalComp, lMctComp, i, lStrLen; + + /* Open file */ + FILE * lFile = fopen(lFilename,"r"); + if (lFile == NULL) { + return 1; + } + + /* Set size of file and read its content*/ + fseek(lFile,0,SEEK_END); + lStrLen = ftell(lFile); + fseek(lFile,0,SEEK_SET); + lMatrix = (char *) malloc(lStrLen + 1); + fread(lMatrix, lStrLen, 1, lFile); + fclose(lFile); + + lMatrix[lStrLen] = 0; + lCurrentPtr = lMatrix; + + /* replace ',' by 0 */ + while (*lCurrentPtr != 0 ) { + if (*lCurrentPtr == ' ') { + *lCurrentPtr = 0; + ++lNbComp; + } + ++lCurrentPtr; + } + ++lNbComp; + lCurrentPtr = lMatrix; + + lNbComp = (int) (sqrt(4*lNbComp + 1)/2. - 0.5); + lMctComp = lNbComp * lNbComp; + lTotalComp = lMctComp + lNbComp; + lSpace = (float *) malloc(lTotalComp * sizeof(float)); + lCurrentDoublePtr = lSpace; + for (i=0;i> */ +#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 (!indexfilename || !*indexfilename) { + strncpy(indexfilename, JPWL_PRIVATEINDEX_NAME, OPJ_PATH_LEN); + } + + /* search for different protection methods */ + + /* break the option in comma points and parse the result */ + token = strtok(opj_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 part header protection method h = %d\n", hprot); + return 1; + } + if (tile < 0) { + fprintf(stderr, "ERROR -> invalid tile part 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 part 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; + + 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 part 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 part 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 part 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 part 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 part header sensitivity method s = %d\n", sens); + return 1; + } + if (tile < 0) { + fprintf(stderr, "ERROR -> invalid tile part 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 part 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') { + + + 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') { + + + 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') { + + + 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 = OPJ_TRUE; + + } + break; +#endif /* USE_JPWL */ +/* <jpip_on = OPJ_TRUE; + } + break; + /* ------------------------------------------------------ */ + + + default: + fprintf(stderr, "ERROR -> Command line not valid\n"); + return 1; + } + }while(c != -1); + + /* check for possible errors */ + 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 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 !!\n"); + return 1; + } + }else{ + if((parameters->infile[0] == 0) || (parameters->outfile[0] == 0)) { + fprintf(stderr, "Example: %s -i image.ppm -o image.j2k\n",argv[0]); + fprintf(stderr, " Try: %s -h\n",argv[0]); + return 1; + } + } + + if ( (parameters->decod_format == RAW_DFMT && raw_cp->rawWidth == 0) + || (parameters->decod_format == RAWL_DFMT && raw_cp->rawWidth == 0)) { + fprintf(stderr,"\nError: invalid raw image parameters\n"); + fprintf(stderr,"Please use the Format option -F:\n"); + fprintf(stderr,"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n"); + fprintf(stderr,"Example: -i lena.raw -o lena.j2k -F 512,512,3,8,u\n"); + fprintf(stderr,"Aborting\n"); + return 1; + } + + if ((parameters->cp_disto_alloc || parameters->cp_fixed_alloc || parameters->cp_fixed_quality) + && (!(parameters->cp_disto_alloc ^ parameters->cp_fixed_alloc ^ parameters->cp_fixed_quality))) { + fprintf(stderr, "Error: options -r -q and -f cannot be used together !!\n"); + return 1; + } /* mod fixed_quality */ + + /* if no rate entered, lossless by default */ + if (parameters->tcp_numlayers == 0) { + parameters->tcp_rates[0] = 0; /* MOD antonin : losslessbug */ + parameters->tcp_numlayers++; + parameters->cp_disto_alloc = 1; + } + + if((parameters->cp_tx0 > parameters->image_offset_x0) || (parameters->cp_ty0 > parameters->image_offset_y0)) { + fprintf(stderr, + "Error: Tile offset dimension is unnappropriate --> TX0(%d)<=IMG_X0(%d) TYO(%d)<=IMG_Y0(%d) \n", + parameters->cp_tx0, parameters->image_offset_x0, parameters->cp_ty0, parameters->image_offset_y0); + return 1; + } + + for (i = 0; i < parameters->numpocs; i++) { + if (parameters->POC[i].prg == -1) { + fprintf(stderr, + "Unrecognized progression order in option -P (POC n %d) [LRCP, RLCP, RPCL, PCRL, CPRL] !!\n", + i + 1); + } + } + + return 0; +} + +/* -------------------------------------------------------------------------- */ + +/** +sample error callback expecting a FILE* client object +*/ +void error_file_callback(const char *msg, void *client_data) { + FILE *stream = (FILE*)client_data; + fprintf(stream, "[ERROR] %s", msg); +} +/** +sample warning callback expecting a FILE* client object +*/ +void warning_file_callback(const char *msg, void *client_data) { + FILE *stream = (FILE*)client_data; + fprintf(stream, "[WARNING] %s", msg); +} +/** +sample debug callback expecting a FILE* client object +*/ +void info_file_callback(const char *msg, void *client_data) { + FILE *stream = (FILE*)client_data; + fprintf(stream, "[INFO] %s", msg); +} + +/** +sample error debug callback expecting no client object +*/ +void error_callback(const char *msg, void *client_data) { + (void)client_data; + fprintf(stdout, "[ERROR] %s", msg); +} +/** +sample warning debug callback expecting no client object +*/ +void warning_callback(const char *msg, void *client_data) { + (void)client_data; + fprintf(stdout, "[WARNING] %s", msg); +} +/** +sample debug callback expecting no client object +*/ +void info_callback(const char *msg, void *client_data) { + (void)client_data; + fprintf(stdout, "[INFO] %s", msg); +} + +/* -------------------------------------------------------------------------- */ +/** + * IMAGE_TO_J2K MAIN + */ +/* -------------------------------------------------------------------------- */ +int main(int argc, char **argv) { + FILE *fout = NULL; + + opj_cparameters_t parameters; /* compression parameters */ + + opj_stream_t *l_stream = 00; + opj_codec_t* l_codec = 00; + opj_image_t *image = NULL; + raw_cparameters_t raw_cp; + + char indexfilename[OPJ_PATH_LEN]; /* index file name */ + + unsigned int i, num_images, imageno; + img_fol_t img_fol; + dircnt_t *dirptr = NULL; + + opj_bool bSuccess; + opj_bool bUseTiles = OPJ_FALSE; /* OPJ_TRUE */ + OPJ_UINT32 l_nb_tiles = 4; + + /* set encoding parameters to default values */ + opj_set_default_encoder_parameters(¶meters); + + /* 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, ¶meters,&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(¶meters); + } + + /* Create comment for codestream */ + if(parameters.cp_comment == NULL) { + 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 +/* <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; + } + for(i=0;ifilename[i] = dirptr->filename_buf + i*OPJ_PATH_LEN; + } + } + 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;imagenonumcomps == 3 ? 1 : 0; + + if(parameters.cp_cinema){ + cinema_setup_encoder(¶meters,image,&img_fol); + } + + /* encode the destination image */ + /* ---------------------------- */ + + switch(parameters.cod_format) { + case JP2_CFMT: /* JPEG 2000 compressed image data */ + { + /* Get a decoder handle */ + l_codec = opj_jpip_create_compress(CODEC_JP2); + break; + } + default: + fprintf(stderr, "skipping file..\n"); + opj_stream_destroy(l_stream); + continue; + } + + /* catch events using our callbacks and give a local context */ + opj_set_info_handler(l_codec, info_callback,00); + opj_set_warning_handler(l_codec, warning_callback,00); + opj_set_error_handler(l_codec, error_callback,00); + + if( bUseTiles ) { + parameters.cp_tx0 = 0; + parameters.cp_ty0 = 0; + parameters.tile_size_on = OPJ_TRUE; + parameters.cp_tdx = 512; + parameters.cp_tdy = 512; + } + opj_setup_encoder(l_codec, ¶meters, image); + + /* Open the output file*/ + fout = fopen(parameters.outfile, "wb"); + if (! fout) { + fprintf(stderr, "Not enable to create output file!\n"); + opj_stream_destroy(l_stream); + return 1; + } + + /* open a byte stream for writing and allocate memory for all tiles */ + l_stream = opj_stream_create_default_file_stream(fout,OPJ_FALSE); + if (! l_stream){ + return 1; + } + + /* encode the image */ + bSuccess = opj_start_compress(l_codec,image,l_stream); + if (!bSuccess) { + fprintf(stderr, "failed to encode image: opj_start_compress\n"); + } + if( bUseTiles ) { + OPJ_BYTE *l_data; + OPJ_UINT32 l_data_size = 512*512*3; + l_data = (OPJ_BYTE*) malloc( l_data_size * sizeof(OPJ_BYTE)); + memset(l_data, 0, l_data_size ); + assert( l_data ); + for (i=0;i test_tile_encoder: failed to write the tile %d!\n",i); + opj_stream_destroy(l_stream); + fclose(fout); + opj_destroy_codec(l_codec); + opj_image_destroy(image); + return 1; + } + } + free(l_data); + } + else { + bSuccess = bSuccess && opj_encode(l_codec, l_stream); + if (!bSuccess) { + fprintf(stderr, "failed to encode image: opj_encode\n"); + } + } + bSuccess = bSuccess && opj_end_compress(l_codec, l_stream); + if (!bSuccess) { + fprintf(stderr, "failed to encode image: opj_end_compress\n"); + } + + if (!bSuccess) { + opj_stream_destroy(l_stream); + fclose(fout); + opj_destroy_codec(l_codec); + opj_image_destroy(image); + fprintf(stderr, "failed to encode image\n"); + return 1; + } + + fprintf(stderr,"Generated outfile %s\n",parameters.outfile); + /* close and free the byte stream */ + opj_stream_destroy(l_stream); + fclose(fout); + + /* free remaining compression structures */ + opj_destroy_codec(l_codec); + + /* 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); + if(parameters.cp_cinema) free(img_fol.rates); + + return 0; +} diff --git a/src/lib/openjp2/jp2.h b/src/lib/openjp2/jp2.h index d02410b6..02c51824 100644 --- a/src/lib/openjp2/jp2.h +++ b/src/lib/openjp2/jp2.h @@ -205,6 +205,7 @@ typedef struct opj_jp2_v2 OPJ_UINT32 *cl; opj_jp2_comps_t *comps; OPJ_OFF_T j2k_codestream_offset; + OPJ_OFF_T jpip_iptr_offset; OPJ_UINT32 jp2_state; OPJ_UINT32 jp2_img_state; diff --git a/src/lib/openjpip/cachemodel_manager.c b/src/lib/openjpip/cachemodel_manager.c index 1a84a6b8..70bbb2c3 100644 --- a/src/lib/openjpip/cachemodel_manager.c +++ b/src/lib/openjpip/cachemodel_manager.c @@ -48,7 +48,7 @@ cachemodellist_param_t * gene_cachemodellist(void) { cachemodellist_param_t *cachemodellist; - cachemodellist = (cachemodellist_param_t *)malloc( sizeof(cachemodellist_param_t)); + cachemodellist = (cachemodellist_param_t *)opj_malloc( sizeof(cachemodellist_param_t)); cachemodellist->first = NULL; cachemodellist->last = NULL; @@ -65,7 +65,7 @@ cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, ta Byte8_t numOftiles; int i; - cachemodel = (cachemodel_param_t *)malloc( sizeof(cachemodel_param_t)); + cachemodel = (cachemodel_param_t *)opj_malloc( sizeof(cachemodel_param_t)); refer_target( target, &cachemodel->target); @@ -86,12 +86,12 @@ cachemodel_param_t * gene_cachemodel( cachemodellist_param_t *cachemodellist, ta tilepart = target->codeidx->tilepart; numOftiles = get_m( tilepart); numOfelem = get_nmax( tilepart)*numOftiles; - cachemodel->tp_model = (bool *)calloc( 1, numOfelem*sizeof(bool)); - cachemodel->th_model = (bool *)calloc( 1, numOftiles*sizeof(bool)); - cachemodel->pp_model = (bool **)malloc( target->codeidx->SIZ.Csiz*sizeof(bool *)); + cachemodel->tp_model = (bool *)opj_calloc( 1, numOfelem*sizeof(bool)); + cachemodel->th_model = (bool *)opj_calloc( 1, numOftiles*sizeof(bool)); + cachemodel->pp_model = (bool **)opj_malloc( target->codeidx->SIZ.Csiz*sizeof(bool *)); for( i=0; icodeidx->SIZ.Csiz; i++){ precpacket = target->codeidx->precpacket[i]; - cachemodel->pp_model[i] = (bool *)calloc( 1, get_nmax(precpacket)*get_m(precpacket)*sizeof(bool)); + cachemodel->pp_model[i] = (bool *)opj_calloc( 1, get_nmax(precpacket)*get_m(precpacket)*sizeof(bool)); } cachemodel->next = NULL; @@ -174,7 +174,7 @@ void delete_cachemodellist( cachemodellist_param_t **cachemodellist) delete_cachemodel( &cachemodelPtr); cachemodelPtr=cachemodelNext; } - free(*cachemodellist); + opj_free(*cachemodellist); } void delete_cachemodel( cachemodel_param_t **cachemodel) @@ -183,17 +183,17 @@ void delete_cachemodel( cachemodel_param_t **cachemodel) unrefer_target( (*cachemodel)->target); - free( (*cachemodel)->tp_model); - free( (*cachemodel)->th_model); + opj_free( (*cachemodel)->tp_model); + opj_free( (*cachemodel)->th_model); for( i=0; i<(*cachemodel)->target->codeidx->SIZ.Csiz; i++) - free( (*cachemodel)->pp_model[i]); - free( (*cachemodel)->pp_model); + opj_free( (*cachemodel)->pp_model[i]); + opj_free( (*cachemodel)->pp_model); #ifndef SERVER fprintf( logstream, "local log: cachemodel deleted\n"); #endif - free( *cachemodel); + opj_free( *cachemodel); } bool is_allsent( cachemodel_param_t cachemodel) diff --git a/src/lib/openjpip/channel_manager.c b/src/lib/openjpip/channel_manager.c index 8060d680..d422b396 100644 --- a/src/lib/openjpip/channel_manager.c +++ b/src/lib/openjpip/channel_manager.c @@ -49,7 +49,7 @@ channellist_param_t * gene_channellist(void) { channellist_param_t *channellist; - channellist = (channellist_param_t *)malloc( sizeof(channellist_param_t)); + channellist = (channellist_param_t *)opj_malloc( sizeof(channellist_param_t)); channellist->first = NULL; channellist->last = NULL; @@ -68,7 +68,7 @@ channel_param_t * gene_channel( query_param_t query_param, auxtrans_param_t auxt return NULL; } - channel = (channel_param_t *)malloc( sizeof(channel_param_t)); + channel = (channel_param_t *)opj_malloc( sizeof(channel_param_t)); channel->cachemodel = cachemodel; /* set channel ID and get present time */ @@ -130,7 +130,7 @@ void delete_channel( channel_param_t **channel, channellist_param_t *channellist #ifndef SERVER fprintf( logstream, "local log: channel: %s deleted\n", (*channel)->cid); #endif - free(*channel); + opj_free(*channel); } void delete_channellist( channellist_param_t **channellist) @@ -143,10 +143,10 @@ void delete_channellist( channellist_param_t **channellist) #ifndef SERVER fprintf( logstream, "local log: channel %s deleted!\n", channelPtr->cid); #endif - free(channelPtr); + opj_free(channelPtr); channelPtr=channelNext; } - free( *channellist); + opj_free( *channellist); } void print_allchannel( channellist_param_t *channellist) diff --git a/src/lib/openjpip/cidx_manager.c b/src/lib/openjpip/cidx_manager.c index f3b251ff..a66358ac 100644 --- a/src/lib/openjpip/cidx_manager.c +++ b/src/lib/openjpip/cidx_manager.c @@ -41,6 +41,11 @@ */ void write_cptr(int coff, int clen, opj_cio_t *cio); +void write_cptr_v2(int coff, int clen, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ); + +void write_manf_v2(int second, int v, opj_jp2_box_t *box, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ); /* * Write main header index table (box) @@ -123,6 +128,79 @@ int write_cidx( int offset, opj_cio_t *cio, opj_image_t *image, opj_codestream_i return len; } +int write_cidx_v2( int offset, opj_stream_private_t *cio, opj_codestream_info_t cstr_info, int j2klen, + opj_event_mgr_t * p_manager ) +{ + int len, i, lenp; + opj_jp2_box_t *box; + int num_box = 0; + opj_bool EPHused; + OPJ_BYTE l_data_header [4]; + + lenp = -1; + box = (opj_jp2_box_t *)opj_calloc( 32, sizeof(opj_jp2_box_t)); + + for (i=0;i<2;i++){ + + if(i) + opj_stream_seek(cio,lenp,p_manager); + + + lenp = opj_stream_tell (cio); + + opj_stream_skip(cio, 4, p_manager); /* L [at the end] */ +#if 0 + cio_write( cio, JPIP_CIDX, 4); /* CIDX */ +#else + opj_write_bytes(l_data_header,JPIP_CIDX,4); /* CIDX */ + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + write_cptr_v2( offset, cstr_info.codestream_size, cio,p_manager); + + write_manf_v2( i, num_box, box, cio,p_manager); + + num_box = 0; + box[num_box].length = write_mainmhix_v2( offset, cstr_info, cio,p_manager); + box[num_box].type = JPIP_MHIX; + num_box++; + + box[num_box].length = write_tpix_v2( offset, cstr_info, j2klen, cio); + box[num_box].type = JPIP_TPIX; + num_box++; + + box[num_box].length = write_thix_v2( offset, cstr_info, cio); + box[num_box].type = JPIP_THIX; + num_box++; + + EPHused = check_EPHuse_v2( offset, cstr_info.marker, cstr_info.marknum, cio); + + box[num_box].length = write_ppix_v2( offset, cstr_info, EPHused, j2klen, cio); + box[num_box].type = JPIP_PPIX; + num_box++; + + box[num_box].length = write_phix_v2( offset, cstr_info, EPHused, j2klen, cio); + box[num_box].type = JPIP_PHIX; + num_box++; + +#if 0 + len = cio_tell( cio)-lenp; + cio_seek( cio, lenp); + cio_write( cio, len, 4); /* L */ + cio_seek( cio, lenp+len); +#else + len = opj_stream_tell(cio)-lenp; + opj_stream_seek(cio, lenp,p_manager); + opj_write_bytes(l_data_header,len,4);/* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek(cio, lenp+len,p_manager); +#endif + } + + opj_free( box); + + return len; +} + void write_cptr(int coff, int clen, opj_cio_t *cio) { int len, lenp; @@ -140,6 +218,42 @@ void write_cptr(int coff, int clen, opj_cio_t *cio) cio_seek( cio, lenp+len); } +void write_cptr_v2(int coff, int clen, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_BYTE l_data_header [3*8]; + int len, lenp; + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_CPTR, 4); /* T */ + cio_write( cio, 0, 2); /* DR A PRECISER !! */ + cio_write( cio, 0, 2); /* CONT */ + cio_write( cio, coff, 8); /* COFF A PRECISER !! */ + cio_write( cio, clen, 8); /* CLEN */ + len = cio_tell( cio) - lenp; + cio_seek( cio, lenp); + cio_write( cio, len, 4); /* L */ + cio_seek( cio, lenp+len); +#else + lenp = opj_stream_tell(cio); + opj_stream_skip( cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes( l_data_header, JPIP_CPTR, 4); /* T */ + opj_write_bytes( l_data_header+4, 0, 2); /* DR A PRECISER !! */ + opj_write_bytes( l_data_header+6, 0, 2); /* CONT */ + opj_write_bytes( l_data_header+8, coff, 8); /* COFF A PRECISER !! */ + opj_write_bytes( l_data_header+16, clen, 8); /* CLEN */ + opj_stream_write_data(cio,l_data_header,3*8,p_manager); + + len = opj_stream_tell(cio) - lenp; + opj_stream_seek(cio,lenp,p_manager); + opj_write_bytes(l_data_header, len, 4); /* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek(cio, lenp+len,p_manager); +#endif +} + void write_manf(int second, int v, opj_jp2_box_t *box, opj_cio_t *cio) { int len, lenp, i; @@ -161,6 +275,51 @@ void write_manf(int second, int v, opj_jp2_box_t *box, opj_cio_t *cio) cio_seek( cio, lenp+len); } +void write_manf_v2(int second, int v, opj_jp2_box_t *box, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_BYTE l_data_header [4]; + int len, lenp, i; + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_MANF,4); /* T */ +#else + lenp = opj_stream_tell(cio); + opj_stream_skip( cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes( l_data_header, JPIP_MANF, 4); /* T */ + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + + if (second){ /* Write only during the second pass */ + for( i=0; i> 2) & 1)) - EPHused = OPJ_TRUE; + EPHused = OPJ_TRUE; cio_seek( cio, org_pos); break; @@ -209,3 +426,44 @@ opj_bool check_EPHuse( int coff, opj_marker_info_t *markers, int marknum, opj_ci } return EPHused; } + +opj_bool check_EPHuse_v2( int coff, opj_marker_info_t *markers, int marknum, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_BYTE l_data_header [4]; + opj_bool EPHused = OPJ_FALSE; + int i=0; + int org_pos; + unsigned int Scod; + + for(i = 0; i < marknum; i++) + { + if( markers[i].type == J2K_MS_COD) + { +#if 0 + org_pos = cio_tell( cio); + cio_seek( cio, coff+markers[i].pos+2); +#else + org_pos = opj_stream_tell(cio); + opj_stream_seek(cio, coff+markers[i].pos+2,p_manager); +#endif + +#if 0 + Scod = cio_read( cio, 1); +#else + opj_stream_read_data(cio,l_data_header,1,p_manager); + opj_read_bytes(l_data_header,&Scod,1); +#endif + if( ((Scod >> 2) & 1)) + EPHused = OPJ_TRUE; +#if 0 + cio_seek( cio, org_pos); +#else + opj_stream_seek( cio, org_pos, p_manager); +#endif + + break; + } + } + return EPHused; +} diff --git a/src/lib/openjpip/dec_clientmsg_handler.c b/src/lib/openjpip/dec_clientmsg_handler.c index 20bd4f2b..ee729228 100644 --- a/src/lib/openjpip/dec_clientmsg_handler.c +++ b/src/lib/openjpip/dec_clientmsg_handler.c @@ -55,7 +55,7 @@ void handle_JPIPstreamMSG( SOCKET connected_socket, cachelist_param_t *cachelist parse_JPIPstream( newjpipstream, newstreamlen, (OPJ_OFF_T)*streamlen, msgqueue); *jpipstream = update_JPIPstream( newjpipstream, newstreamlen, *jpipstream, streamlen); - free( newjpipstream); + opj_free( newjpipstream); metadatalist = gene_metadatalist(); parse_metamsg( msgqueue, *jpipstream, *streamlen, metadatalist); @@ -82,9 +82,9 @@ void handle_JPIPstreamMSG( SOCKET connected_socket, cachelist_param_t *cachelist delete_metadatalist( &cache->metadatalist); cache->metadatalist = metadatalist; - if( target) free( target); - if( tid) free( tid); - if( cid) free( cid); + if( target) opj_free( target); + if( tid) opj_free( tid); + if( cid) opj_free( cid); response_signal( connected_socket, true); } @@ -102,11 +102,11 @@ void handle_PNMreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_par if(!(cache = search_cacheBycid( CIDorTID, cachelist))) if(!(cache = search_cacheBytid( CIDorTID, cachelist))){ - free( CIDorTID); + opj_free( CIDorTID); return; } - free( CIDorTID); + opj_free( CIDorTID); receive_line( connected_socket, tmp); fw = atoi( tmp); @@ -121,8 +121,8 @@ void handle_PNMreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_par maxval = ihdrbox->bpc > 8 ? 255 : (1 << ihdrbox->bpc) - 1; send_PNMstream( connected_socket, pnmstream, ihdrbox->width, ihdrbox->height, ihdrbox->nc, (Byte_t)maxval ); - free( ihdrbox); - free( pnmstream); + opj_free( ihdrbox); + opj_free( pnmstream); } void handle_XMLreqMSG( SOCKET connected_socket, Byte_t *jpipstream, cachelist_param_t *cachelist) @@ -135,17 +135,17 @@ void handle_XMLreqMSG( SOCKET connected_socket, Byte_t *jpipstream, cachelist_pa cid = receive_string( connected_socket); if(!(cache = search_cacheBycid( cid, cachelist))){ - free( cid); + opj_free( cid); return; } - free( cid); + opj_free( cid); boxcontents = cache->metadatalist->last->boxcontents; - xmlstream = (Byte_t *)malloc( boxcontents->length); + xmlstream = (Byte_t *)opj_malloc( boxcontents->length); memcpy( xmlstream, jpipstream+boxcontents->offset, boxcontents->length); send_XMLstream( connected_socket, xmlstream, boxcontents->length); - free( xmlstream); + opj_free( xmlstream); } void handle_TIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist) @@ -157,7 +157,7 @@ void handle_TIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist) target = receive_string( connected_socket); cache = search_cache( target, cachelist); - free( target); + opj_free( target); if( cache){ tid = cache->tid; @@ -175,7 +175,7 @@ void handle_CIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist) target = receive_string( connected_socket); cache = search_cache( target, cachelist); - free( target); + opj_free( target); if( cache){ if( cache->numOfcid > 0){ @@ -194,7 +194,7 @@ void handle_dstCIDreqMSG( SOCKET connected_socket, cachelist_param_t *cachelist) remove_cachecid( cid, cachelist); response_signal( connected_socket, true); - free( cid); + opj_free( cid); } void handle_SIZreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_param_t *msgqueue, cachelist_param_t *cachelist) @@ -214,8 +214,8 @@ void handle_SIZreqMSG( SOCKET connected_socket, Byte_t *jpipstream, msgqueue_par if( !cache && cid[0] != '0') cache = search_cacheBycid( cid, cachelist); - free( tid); - free( cid); + opj_free( tid); + opj_free( cid); width = height = 0; if( cache){ @@ -237,17 +237,17 @@ void handle_JP2saveMSG( SOCKET connected_socket, cachelist_param_t *cachelist, m cid = receive_string( connected_socket); if(!(cache = search_cacheBycid( cid, cachelist))){ - free( cid); + opj_free( cid); return; } - free( cid); + opj_free( cid); assert( cache->csn >= 0); jp2stream = recons_jp2( msgqueue, jpipstream, (Byte8_t)cache->csn, &jp2len); if( jp2stream){ save_codestream( jp2stream, jp2len, "jp2"); - free( jp2stream); + opj_free( jp2stream); } } diff --git a/src/lib/openjpip/index_manager.c b/src/lib/openjpip/index_manager.c index e4812226..b15d0b40 100644 --- a/src/lib/openjpip/index_manager.c +++ b/src/lib/openjpip/index_manager.c @@ -99,11 +99,11 @@ index_param_t * parse_jp2file( int fd) return NULL; } - jp2idx = (index_param_t *)malloc( sizeof(index_param_t)); + jp2idx = (index_param_t *)opj_malloc( sizeof(index_param_t)); if( !set_cidxdata( cidx, jp2idx)){ fprintf( FCGI_stderr, "Error: Not correctl format in cidx box\n"); - free(jp2idx); + opj_free(jp2idx); delete_boxlist( &toplev_boxlist); return NULL; } @@ -190,19 +190,19 @@ void delete_index( index_param_t **index) for( i=0; i< (int)((*index)->SIZ.XTnum*(*index)->SIZ.YTnum);i++) delete_mhixbox( &((*index)->tileheader[i])); - free( (*index)->tileheader); + opj_free( (*index)->tileheader); for( i=0; i<(*index)->SIZ.Csiz; i++) delete_faixbox( &((*index)->precpacket[i])); - free( (*index)->precpacket); + opj_free( (*index)->precpacket); - free(*index); + opj_free(*index); } void delete_COD( CODmarker_param_t COD) { - if( COD.XPsiz) free( COD.XPsiz); - if( COD.YPsiz) free( COD.YPsiz); + if( COD.XPsiz) opj_free( COD.XPsiz); + if( COD.YPsiz) opj_free( COD.YPsiz); } bool check_JP2boxidx( boxlist_param_t *toplev_boxlist) @@ -242,7 +242,7 @@ bool check_JP2boxidx( boxlist_param_t *toplev_boxlist) if( obh->length != jp2c->length || strncmp( obh->type, "jp2c",4)!=0) fprintf( FCGI_stderr, "Reference jp2c header in prxy box not correct\n"); pos += obh->headlen; - free(obh); + opj_free(obh); ni = fetch_DBox1byte( prxy, pos); if( ni != 1){ @@ -260,9 +260,9 @@ bool check_JP2boxidx( boxlist_param_t *toplev_boxlist) if( ibh->length != cidx->length || strncmp( ibh->type, "cidx",4)!=0) fprintf( FCGI_stderr, "Reference cidx header in prxy box not correct\n"); pos += ibh->headlen; - free(ibh); + opj_free(ibh); - free(prxy); + opj_free(prxy); return true; } @@ -333,34 +333,34 @@ bool set_cidxdata( box_param_t *cidx_box, index_param_t *jp2idx) if( !search_boxheader( "mhix", manf)){ fprintf( FCGI_stderr, "Error: mhix box not present in manfbox\n"); - free(jp2idx); + opj_free(jp2idx); return false; } set_mainmhixdata( cidx_box, codestream, jp2idx); if( !search_boxheader( "tpix", manf)){ fprintf( FCGI_stderr, "Error: tpix box not present in manfbox\n"); - free(jp2idx); + opj_free(jp2idx); return false; } set_tpixdata( cidx_box, jp2idx); if( !search_boxheader( "thix", manf)){ fprintf( FCGI_stderr, "Error: thix box not present in manfbox\n"); - free(jp2idx); + opj_free(jp2idx); return false; } set_thixdata( cidx_box, jp2idx); if( !search_boxheader( "ppix", manf)){ fprintf( FCGI_stderr, "Error: ppix box not present in manfbox\n"); - free(jp2idx); + opj_free(jp2idx); return false; } set_ppixdata( cidx_box, jp2idx); delete_manfbox( &manf); - free( manf_box); + opj_free( manf_box); return true; } @@ -377,7 +377,7 @@ bool set_cptrdata( box_param_t *cidx_box, index_param_t *jp2idx) /* If 0, the codestream or its Fragment Table box exists in the current file*/ if(( dr = fetch_DBox2bytebigendian( box, 0))){ fprintf( FCGI_stderr, "Error: Codestream not present in current file\n"); - free( box); + opj_free( box); return false; } @@ -386,14 +386,14 @@ bool set_cptrdata( box_param_t *cidx_box, index_param_t *jp2idx) /* bytes within its file or resource.*/ if(( cont = fetch_DBox2bytebigendian( box, 2))){ fprintf( FCGI_stderr, "Error: Can't cope with fragmented codestreams yet\n"); - free( box); + opj_free( box); return false; } jp2idx->offset = (OPJ_OFF_T)fetch_DBox8bytebigendian( box, 4); jp2idx->length = fetch_DBox8bytebigendian( box, 12); - free( box); + opj_free( box); return true; } @@ -436,7 +436,7 @@ bool set_mainmhixdata( box_param_t *cidx_box, codestream_param_t codestream, ind jp2idx->mhead_length = fetch_DBox8bytebigendian( mhix_box, 0); mhix = gene_mhixbox( mhix_box); - free( mhix_box); + opj_free( mhix_box); sizmkidx = search_markeridx( 0xff51, mhix); set_SIZmkrdata( sizmkidx, codestream, &(jp2idx->SIZ)); @@ -466,8 +466,8 @@ bool set_tpixdata( box_param_t *cidx_box, index_param_t *jp2idx) jp2idx->tilepart = gene_faixbox( faix_box); - free( tpix_box); - free( faix_box); + opj_free( tpix_box); + opj_free( faix_box); return true; } @@ -489,7 +489,7 @@ bool set_thixdata( box_param_t *cidx_box, index_param_t *jp2idx) if( !(manf_box = gene_boxbyType( thix_box->fd, get_DBoxoff( thix_box), get_DBoxlen( thix_box), "manf"))){ fprintf( FCGI_stderr, "Error: manf box not present in thix box\n"); - free( thix_box); + opj_free( thix_box); return false; } @@ -498,14 +498,14 @@ bool set_thixdata( box_param_t *cidx_box, index_param_t *jp2idx) mhixseqoff = manf_box->offset+(OPJ_OFF_T)manf_box->length; pos = 0; tile_no = 0; - jp2idx->tileheader = (mhixbox_param_t **)malloc( jp2idx->SIZ.XTnum*jp2idx->SIZ.YTnum*sizeof(mhixbox_param_t *)); + jp2idx->tileheader = (mhixbox_param_t **)opj_malloc( jp2idx->SIZ.XTnum*jp2idx->SIZ.YTnum*sizeof(mhixbox_param_t *)); while( ptr){ if( !(mhix_box = gene_boxbyType( thix_box->fd, mhixseqoff+(OPJ_OFF_T)pos, get_DBoxlen( thix_box)-manf_box->length-pos, "mhix"))){ fprintf( FCGI_stderr, "Error: mhix box not present in thix box\n"); delete_manfbox( &manf); - free( manf_box); - free( thix_box); + opj_free( manf_box); + opj_free( thix_box); return false; } mhix = gene_mhixbox( mhix_box); @@ -513,13 +513,13 @@ bool set_thixdata( box_param_t *cidx_box, index_param_t *jp2idx) pos += mhix_box->length; ptr = ptr->next; - free( mhix_box); + opj_free( mhix_box); jp2idx->tileheader[tile_no++] = mhix; } delete_manfbox( &manf); - free( manf_box); - free( thix_box); + opj_free( manf_box); + opj_free( thix_box); return true; } @@ -541,19 +541,19 @@ bool set_ppixdata( box_param_t *cidx_box, index_param_t *jp2idx) inbox_offset = get_DBoxoff( ppix_box); if( !(manf_box = gene_boxbyType( ppix_box->fd, inbox_offset, get_DBoxlen( ppix_box), "manf"))){ fprintf( FCGI_stderr, "Error: manf box not present in ppix box\n"); - free( ppix_box); + opj_free( ppix_box); return false; } - free( ppix_box); + opj_free( ppix_box); manf = gene_manfbox( manf_box); bh = search_boxheader( "faix", manf); inbox_offset = manf_box->offset + (OPJ_OFF_T)manf_box->length; - free( manf_box); + opj_free( manf_box); - jp2idx->precpacket = (faixbox_param_t **)malloc( jp2idx->SIZ.Csiz*sizeof(faixbox_param_t *)); + jp2idx->precpacket = (faixbox_param_t **)opj_malloc( jp2idx->SIZ.Csiz*sizeof(faixbox_param_t *)); for( comp_idx=0; bh!=NULL; bh=bh->next, comp_idx++){ if( jp2idx->SIZ.Csiz <= comp_idx ){ @@ -570,7 +570,7 @@ bool set_ppixdata( box_param_t *cidx_box, index_param_t *jp2idx) jp2idx->precpacket[comp_idx] = faix; inbox_offset = faix_box->offset + (OPJ_OFF_T)faix_box->length; - free( faix_box); + opj_free( faix_box); } delete_manfbox( &manf); @@ -634,8 +634,8 @@ bool set_CODmkrdata( markeridx_param_t *codmkidx, codestream_param_t codestream, COD->numOfdecomp = fetch_marker1byte( codmkr, 7); if(COD->Scod & 0x01){ - COD->XPsiz = (Byte4_t *)malloc( (OPJ_SIZE_T)(COD->numOfdecomp+1)*sizeof(Byte4_t)); - COD->YPsiz = (Byte4_t *)malloc( (OPJ_SIZE_T)(COD->numOfdecomp+1)*sizeof(Byte4_t)); + COD->XPsiz = (Byte4_t *)opj_malloc( (OPJ_SIZE_T)(COD->numOfdecomp+1)*sizeof(Byte4_t)); + COD->YPsiz = (Byte4_t *)opj_malloc( (OPJ_SIZE_T)(COD->numOfdecomp+1)*sizeof(Byte4_t)); for( i=0; i<=COD->numOfdecomp; i++){ /*precinct size*/ @@ -644,8 +644,8 @@ bool set_CODmkrdata( markeridx_param_t *codmkidx, codestream_param_t codestream, } } else{ - COD->XPsiz = (Byte4_t *)malloc( sizeof(Byte4_t)); - COD->YPsiz = (Byte4_t *)malloc( sizeof(Byte4_t)); + COD->XPsiz = (Byte4_t *)opj_malloc( sizeof(Byte4_t)); + COD->YPsiz = (Byte4_t *)opj_malloc( sizeof(Byte4_t)); COD->XPsiz[0] = COD->YPsiz[0] = pow(2,15); } diff --git a/src/lib/openjpip/index_manager.h b/src/lib/openjpip/index_manager.h index a9f141c8..049f0771 100644 --- a/src/lib/openjpip/index_manager.h +++ b/src/lib/openjpip/index_manager.h @@ -31,6 +31,9 @@ #ifndef INDEX_MANAGER_H_ # define INDEX_MANAGER_H_ +#include "opj_config.h" +#include "opj_includes.h" + #include "byte_manager.h" #include "faixbox_manager.h" #include "metadata_manager.h" @@ -38,6 +41,7 @@ #include "bool.h" /** progression order */ +#if 0 typedef enum porder { PROG_UNKNOWN = -1, /**< place-holder */ LRCP = 0, /**< layer-resolution-component-precinct order */ @@ -46,6 +50,7 @@ typedef enum porder { PCRL = 3, /**< precinct-component-resolution-layer order */ CPRL = 4 /**< component-precinct-resolution-layer order */ } porder_t; +#endif /** A.5.1 Image and tile size (SIZ)*/ typedef struct SIZmarker_param{ @@ -71,7 +76,7 @@ typedef struct SIZmarker_param{ typedef struct CODmarker_param{ Byte2_t Lcod; /**< length of marker segment excluding the marker*/ Byte_t Scod; /**< Coding style for all components*/ - porder_t prog_order; /**< progression order*/ + OPJ_PROG_ORDER prog_order; /**< progression order*/ Byte2_t numOflayers; /**< number of layers*/ Byte_t numOfdecomp; /**< number of decompositions levels*/ Byte4_t *XPsiz; /**< dynamic array of precinct width at successive resolution level in order*/ diff --git a/src/lib/openjpip/j2kheader_manager.c b/src/lib/openjpip/j2kheader_manager.c index 5a6054cc..b61da5ef 100644 --- a/src/lib/openjpip/j2kheader_manager.c +++ b/src/lib/openjpip/j2kheader_manager.c @@ -127,8 +127,8 @@ CODmarker_param_t get_CODmkrdata_from_j2kstream( Byte_t *CODstream) COD.numOfdecomp = *( CODstream+7); if(COD.Scod & 0x01){ - COD.XPsiz = (Byte4_t *)malloc( (OPJ_SIZE_T)(COD.numOfdecomp+1)*sizeof(Byte4_t)); - COD.YPsiz = (Byte4_t *)malloc( (OPJ_SIZE_T)(COD.numOfdecomp+1)*sizeof(Byte4_t)); + COD.XPsiz = (Byte4_t *)opj_malloc( (OPJ_SIZE_T)(COD.numOfdecomp+1)*sizeof(Byte4_t)); + COD.YPsiz = (Byte4_t *)opj_malloc( (OPJ_SIZE_T)(COD.numOfdecomp+1)*sizeof(Byte4_t)); for( i=0; i<=COD.numOfdecomp; i++){ /*precinct size */ @@ -137,8 +137,8 @@ CODmarker_param_t get_CODmkrdata_from_j2kstream( Byte_t *CODstream) } } else{ - COD.XPsiz = (Byte4_t *)malloc( sizeof(Byte4_t)); - COD.YPsiz = (Byte4_t *)malloc( sizeof(Byte4_t)); + COD.XPsiz = (Byte4_t *)opj_malloc( sizeof(Byte4_t)); + COD.YPsiz = (Byte4_t *)opj_malloc( sizeof(Byte4_t)); COD.XPsiz[0] = COD.YPsiz[0] = pow(2,15); } return COD; diff --git a/src/lib/openjpip/jp2k_encoder.c b/src/lib/openjpip/jp2k_encoder.c index 23c8b2fe..9241f713 100644 --- a/src/lib/openjpip/jp2k_encoder.c +++ b/src/lib/openjpip/jp2k_encoder.c @@ -122,7 +122,7 @@ Byte_t * recons_jp2( msgqueue_param_t *msgqueue, Byte_t *jpipstream, Byte8_t csn if( jp2cDBoxOffset != 0 && codelen <= jp2cDBoxlen) memcpy( jp2stream+jp2cDBoxOffset, codestream, codelen); - free( codestream); + opj_free( codestream); return jp2stream; } @@ -314,14 +314,14 @@ Byte_t * add_SOTmkr( Byte_t *j2kstream, Byte8_t *j2klen) Byte_t *buf; const Byte2_t SOT = 0x90ff; - buf = (Byte_t *)malloc(( *j2klen)+2); + buf = (Byte_t *)opj_malloc(( *j2klen)+2); memcpy( buf, j2kstream, *j2klen); memcpy( buf+(*j2klen), &SOT, 2); *j2klen += 2; - if(j2kstream) free(j2kstream); + if(j2kstream) opj_free(j2kstream); return buf; } @@ -660,15 +660,15 @@ Byte_t * add_msgstream( message_param_t *message, Byte_t *origstream, Byte_t *j2 newstream = gene_msgstream( message, origstream, &newlen); - buf = (Byte_t *)malloc(( *j2klen)+newlen); + buf = (Byte_t *)opj_malloc(( *j2klen)+newlen); memcpy( buf, j2kstream, *j2klen); memcpy( buf+(*j2klen), newstream, newlen); *j2klen += newlen; - free( newstream); - if(j2kstream) free(j2kstream); + opj_free( newstream); + if(j2kstream) opj_free(j2kstream); return buf; } @@ -685,19 +685,19 @@ Byte_t * add_emptyboxstream( placeholder_param_t *phld, Byte_t *jp2stream, Byte8 else newlen = big8(phld->OrigBH+8); - newstream = (Byte_t *)malloc( newlen); + newstream = (Byte_t *)opj_malloc( newlen); memset( newstream, 0, newlen); memcpy( newstream, phld->OrigBH, phld->OrigBHlen); - buf = (Byte_t *)malloc(( *jp2len)+newlen); + buf = (Byte_t *)opj_malloc(( *jp2len)+newlen); memcpy( buf, jp2stream, *jp2len); memcpy( buf+(*jp2len), newstream, newlen); *jp2len += newlen; - free( newstream); - if(jp2stream) free(jp2stream); + opj_free( newstream); + if(jp2stream) opj_free(jp2stream); return buf; } @@ -710,15 +710,15 @@ Byte_t * add_emptytilestream( const Byte8_t tileID, Byte_t *j2kstream, Byte8_t * newstream = gene_emptytilestream( tileID, &newlen); - buf = (Byte_t *)malloc(( *j2klen)+newlen); + buf = (Byte_t *)opj_malloc(( *j2klen)+newlen); memcpy( buf, j2kstream, *j2klen); memcpy( buf+(*j2klen), newstream, newlen); *j2klen += newlen; - free( newstream); - if(j2kstream) free(j2kstream); + opj_free( newstream); + if(j2kstream) opj_free(j2kstream); return buf; } @@ -727,14 +727,14 @@ Byte_t * add_padding( Byte8_t padding, Byte_t *j2kstream, Byte8_t *j2klen) { Byte_t *buf; - buf = (Byte_t *)malloc(( *j2klen)+padding); + buf = (Byte_t *)opj_malloc(( *j2klen)+padding); memcpy( buf, j2kstream, *j2klen); memset( buf+(*j2klen), 0, padding); *j2klen += padding; - if(j2kstream) free(j2kstream); + if(j2kstream) opj_free(j2kstream); return buf; } @@ -745,14 +745,14 @@ Byte_t * add_EOC( Byte_t *j2kstream, Byte8_t *j2klen) Byte_t *buf; - buf = (Byte_t *)malloc(( *j2klen)+2); + buf = (Byte_t *)opj_malloc(( *j2klen)+2); memcpy( buf, j2kstream, *j2klen); memcpy( buf+(*j2klen), &EOC, 2); *j2klen += 2; - if(j2kstream) free(j2kstream); + if(j2kstream) opj_free(j2kstream); return buf; } @@ -765,7 +765,7 @@ Byte_t * gene_msgstream( message_param_t *message, Byte_t *stream, Byte8_t *leng return NULL; *length = message->length; - buf = (Byte_t *)malloc( *length); + buf = (Byte_t *)opj_malloc( *length); memcpy( buf, stream+message->res_offset, *length); return buf; @@ -782,7 +782,7 @@ Byte_t * gene_emptytilestream( const Byte8_t tileID, Byte8_t *length) const Byte2_t SOD = 0x93ff; *length = 14; - buf = (Byte_t *)malloc(*length); + buf = (Byte_t *)opj_malloc(*length); Isot = (Byte2_t)((((Byte2_t)tileID) << 8) | ((((Byte2_t)tileID) & 0xf0) >> 8)); diff --git a/src/lib/openjpip/jpipstream_manager.c b/src/lib/openjpip/jpipstream_manager.c index 8cb2a77f..3227af75 100644 --- a/src/lib/openjpip/jpipstream_manager.c +++ b/src/lib/openjpip/jpipstream_manager.c @@ -40,14 +40,14 @@ Byte_t * update_JPIPstream( Byte_t *newstream, OPJ_SIZE_T newstreamlen, Byte_t *cache_stream, OPJ_SIZE_T *streamlen) { - Byte_t *stream = (Byte_t *)malloc( (*streamlen)+newstreamlen); + Byte_t *stream = (Byte_t *)opj_malloc( (*streamlen)+newstreamlen); if( *streamlen > 0) memcpy( stream, cache_stream, *streamlen); memcpy( stream+(*streamlen), newstream, newstreamlen); *streamlen += newstreamlen; if(cache_stream) - free( cache_stream); + opj_free( cache_stream); return stream; } @@ -83,7 +83,7 @@ Byte_t * jpipstream_to_pnm( Byte_t *jpipstream, msgqueue_param_t *msgqueue, Byte fp = fopen( j2kfname, "w+b"); fwrite( j2kstream, j2klen, 1, fp); - free( j2kstream); + opj_free( j2kstream); fseek( fp, 0, SEEK_SET); pnmstream = j2k_to_pnm( fp, ihdrbox); @@ -103,18 +103,18 @@ ihdrbox_param_t * get_SIZ_from_jpipstream( Byte_t *jpipstream, msgqueue_param_t j2kstream = recons_j2kmainhead( msgqueue, jpipstream, csn, &j2klen); if( !get_mainheader_from_j2kstream( j2kstream, &SIZ, NULL)){ - free( j2kstream); + opj_free( j2kstream); return NULL; } - ihdrbox = (ihdrbox_param_t *)malloc( sizeof(ihdrbox_param_t)); + ihdrbox = (ihdrbox_param_t *)opj_malloc( sizeof(ihdrbox_param_t)); ihdrbox->width = SIZ.Xsiz; ihdrbox->height = SIZ.Ysiz; ihdrbox->nc = SIZ.Csiz; ihdrbox->bpc = SIZ.Ssiz[0]; - free( j2kstream); + opj_free( j2kstream); return ihdrbox; } diff --git a/src/lib/openjpip/msgqueue_manager.c b/src/lib/openjpip/msgqueue_manager.c index 31d3991f..1bc498a6 100644 --- a/src/lib/openjpip/msgqueue_manager.c +++ b/src/lib/openjpip/msgqueue_manager.c @@ -60,7 +60,7 @@ msgqueue_param_t * gene_msgqueue( bool stateless, cachemodel_param_t *cachemodel { msgqueue_param_t *msgqueue; - msgqueue = (msgqueue_param_t *)malloc( sizeof(msgqueue_param_t)); + msgqueue = (msgqueue_param_t *)opj_malloc( sizeof(msgqueue_param_t)); msgqueue->first = NULL; msgqueue->last = NULL; @@ -82,13 +82,13 @@ void delete_msgqueue( msgqueue_param_t **msgqueue) while( ptr){ next = ptr->next; - free( ptr); + opj_free( ptr); ptr = next; } if( (*msgqueue)->stateless && (*msgqueue)->cachemodel) delete_cachemodel( &((*msgqueue)->cachemodel)); - free(*msgqueue); + opj_free(*msgqueue); } void print_msgqueue( msgqueue_param_t *msgqueue) @@ -135,7 +135,7 @@ void enqueue_mainheader( msgqueue_param_t *msgqueue) target = cachemodel->target; codeidx = target->codeidx; - msg = (message_param_t *)malloc( sizeof(message_param_t)); + msg = (message_param_t *)opj_malloc( sizeof(message_param_t)); msg->last_byte = true; msg->in_class_id = 0; @@ -166,7 +166,7 @@ void enqueue_tileheader( int tile_id, msgqueue_param_t *msgqueue) codeidx = target->codeidx; if( !cachemodel->th_model[ tile_id]){ - msg = (message_param_t *)malloc( sizeof(message_param_t)); + msg = (message_param_t *)opj_malloc( sizeof(message_param_t)); msg->last_byte = true; assert( tile_id >= 0 ); msg->in_class_id = (Byte8_t)tile_id; @@ -220,7 +220,7 @@ void enqueue_tile( Byte4_t tile_id, int level, msgqueue_param_t *msgqueue) binLength = get_elemLen( tilepart, i, tile_id); if( !tp_model[i]){ - msg = (message_param_t *)malloc( sizeof(message_param_t)); + msg = (message_param_t *)opj_malloc( sizeof(message_param_t)); msg->last_byte = (i==numOftparts-1); msg->in_class_id = tile_id; @@ -269,7 +269,7 @@ void enqueue_precinct( int seq_id, int tile_id, int comp_id, int layers, msgqueu if( !cachemodel->pp_model[comp_id][tile_id*(int)nmax+seq_id*numOflayers+layer_id]){ - msg = (message_param_t *)malloc( sizeof(message_param_t)); + msg = (message_param_t *)opj_malloc( sizeof(message_param_t)); msg->last_byte = (layer_id == (numOflayers-1)); msg->in_class_id = comp_precinct_id( tile_id, comp_id, seq_id, codeidx->SIZ.Csiz, (int)codeidx->SIZ.XTnum * (int) codeidx->SIZ.YTnum); msg->class_id = PRECINCT_MSG; @@ -376,7 +376,7 @@ message_param_t * gene_metamsg( Byte8_t meta_id, Byte8_t binOffset, Byte8_t leng { message_param_t *msg; - msg = (message_param_t *)malloc( sizeof(message_param_t)); + msg = (message_param_t *)opj_malloc( sizeof(message_param_t)); msg->last_byte = false; msg->in_class_id = meta_id; @@ -521,11 +521,11 @@ void add_body_stream( message_param_t *msg, int fd, int tmpfd) } if( write( tmpfd, data, msg->length) < 1){ - free( data); + opj_free( data); fprintf( FCGI_stderr, "Error: fwrite in add_body_stream()\n"); return; } - free(data); + opj_free(data); } void add_bigendian_bytestream( Byte8_t code, int bytelength, int tmpfd); @@ -596,7 +596,7 @@ void parse_JPIPstream( Byte_t *JPIPstream, Byte8_t streamlen, OPJ_OFF_T offset, csn = (Byte8_t)-1; ptr = JPIPstream; while( (Byte8_t)(ptr-JPIPstream) < streamlen){ - msg = (message_param_t *)malloc( sizeof(message_param_t)); + msg = (message_param_t *)opj_malloc( sizeof(message_param_t)); ptr = parse_bin_id_vbas( ptr, &bb, &c, &msg->in_class_id); @@ -689,14 +689,14 @@ placeholder_param_t * parse_phld( Byte_t *datastream, Byte8_t metalength) { placeholder_param_t *phld; - phld = (placeholder_param_t *)malloc( sizeof(placeholder_param_t)); + phld = (placeholder_param_t *)opj_malloc( sizeof(placeholder_param_t)); phld->LBox = big4( datastream); strcpy( phld->TBox, "phld"); phld->Flags = big4( datastream+8); phld->OrigID = big8( datastream+12); phld->OrigBHlen = (Byte_t)(metalength - 20); - phld->OrigBH = (Byte_t *)malloc(phld->OrigBHlen); + phld->OrigBH = (Byte_t *)opj_malloc(phld->OrigBHlen); memcpy( phld->OrigBH, datastream+20, phld->OrigBHlen); phld->next = NULL; @@ -758,5 +758,5 @@ void delete_message_in_msgqueue( message_param_t **msg, msgqueue_param_t *msgque if( *msg == msgqueue->last) msgqueue->last = ptr; } - free( *msg); + opj_free( *msg); } diff --git a/src/lib/openjpip/openjpip.c b/src/lib/openjpip/openjpip.c index de6293d4..a817a466 100644 --- a/src/lib/openjpip/openjpip.c +++ b/src/lib/openjpip/openjpip.c @@ -57,7 +57,7 @@ server_record_t * init_JPIPserver( int tcp_auxport, int udp_auxport) { - server_record_t *record = (server_record_t *)malloc( sizeof(server_record_t)); + server_record_t *record = (server_record_t *)opj_malloc( sizeof(server_record_t)); record->sessionlist = gene_sessionlist(); record->targetlist = gene_targetlist(); @@ -72,14 +72,14 @@ void terminate_JPIPserver( server_record_t **rec) delete_targetlist( &(*rec)->targetlist); close_aux_transport( (*rec)->auxtrans); - free( *rec); + opj_free( *rec); } QR_t * parse_querystring( const char *query_string) { QR_t *qr; - qr = (QR_t *)malloc( sizeof(QR_t)); + qr = (QR_t *)opj_malloc( sizeof(QR_t)); qr->query = parse_query( query_string); qr->msgqueue = NULL; @@ -162,7 +162,7 @@ void send_responsedata( server_record_t *rec, QR_t *qr) fprintf( FCGI_stderr, "Error: failed to write jpipstream\n"); } - free( jpipstream); + opj_free( jpipstream); return; } @@ -186,7 +186,7 @@ void end_QRprocess( server_record_t *rec, QR_t **qr) (void)rec; /* unused */ delete_query( &((*qr)->query)); delete_msgqueue( &((*qr)->msgqueue)); - free( *qr); + opj_free( *qr); } @@ -211,7 +211,7 @@ void local_log( bool query, bool messages, bool sessions, bool targets, QR_t *qr dec_server_record_t * init_dec_server( int port) { - dec_server_record_t *record = (dec_server_record_t *)malloc( sizeof(dec_server_record_t)); + dec_server_record_t *record = (dec_server_record_t *)opj_malloc( sizeof(dec_server_record_t)); record->cachelist = gene_cachelist(); record->jpipstream = NULL; @@ -225,7 +225,7 @@ dec_server_record_t * init_dec_server( int port) void terminate_dec_server( dec_server_record_t **rec) { delete_cachelist( &(*rec)->cachelist); - free( (*rec)->jpipstream); + opj_free( (*rec)->jpipstream); if( (*rec)->msgqueue) delete_msgqueue( &((*rec)->msgqueue)); @@ -233,7 +233,7 @@ void terminate_dec_server( dec_server_record_t **rec) if( close_socket( (*rec)->listening_socket) != 0) perror("close"); - free( *rec); + opj_free( *rec); } client_t accept_connection( dec_server_record_t *rec) @@ -310,7 +310,7 @@ jpip_dec_param_t * init_jpipdecoder( bool jp2) { jpip_dec_param_t *dec; - dec = (jpip_dec_param_t *)calloc( 1, sizeof(jpip_dec_param_t)); + dec = (jpip_dec_param_t *)opj_calloc( 1, sizeof(jpip_dec_param_t)); dec->msgqueue = gene_msgqueue( true, NULL); @@ -333,11 +333,11 @@ bool fread_jpip( const char fname[], jpip_dec_param_t *dec) if(!(dec->jpiplen = (Byte8_t)get_filesize(infd))) return false; - dec->jpipstream = (Byte_t *)malloc( dec->jpiplen); + dec->jpipstream = (Byte_t *)opj_malloc( dec->jpiplen); if( read( infd, dec->jpipstream, dec->jpiplen) != (int)dec->jpiplen){ fprintf( stderr, "file reading error\n"); - free( dec->jpipstream); + opj_free( dec->jpipstream); return false; } @@ -398,15 +398,15 @@ void output_log( bool messages, bool metadata, bool ihdrbox, jpip_dec_param_t *d void destroy_jpipdecoder( jpip_dec_param_t **dec) { - free( (*dec)->jpipstream); + opj_free( (*dec)->jpipstream); delete_msgqueue( &(*dec)->msgqueue); if( (*dec)->metadatalist){ delete_metadatalist( &(*dec)->metadatalist); - free( (*dec)->ihdrbox); + opj_free( (*dec)->ihdrbox); } - free( (*dec)->jp2kstream); - free( *dec); + opj_free( (*dec)->jp2kstream); + opj_free( *dec); } index_t * get_index_from_JP2file( int fd) @@ -419,20 +419,20 @@ index_t * get_index_from_JP2file( int fd) return NULL; } - data = (char *)malloc( 12); /* size of header*/ + data = (char *)opj_malloc( 12); /* size of header*/ if( read( fd, data, 12) != 12){ - free( data); + opj_free( data); fprintf( stderr, "Error: File broken (read error)\n"); return NULL; } if( *data || *(data + 1) || *(data + 2) || *(data + 3) != 12 || strncmp (data + 4, "jP \r\n\x87\n", 8)){ - free( data); + opj_free( data); fprintf( stderr, "Error: No JPEG 2000 Signature box in this file\n"); return NULL; } - free( data); + opj_free( data); return parse_jp2file( fd); } @@ -447,4 +447,731 @@ void output_index( index_t *index) print_index( *index); } +/* ---------------------------------------------------------------------- */ +/* COMPRESSION FUNCTIONS*/ +typedef struct opj_decompression +{ + /** Main header reading function handler*/ + opj_bool (*opj_read_header) ( struct opj_stream_private * cio, + void * p_codec, + opj_image_t **p_image, + struct opj_event_mgr * p_manager); + /** Decoding function */ + opj_bool (*opj_decode) ( void * p_codec, + struct opj_stream_private *p_cio, + opj_image_t *p_image, + struct opj_event_mgr * p_manager); + /** FIXME DOC */ + opj_bool (*opj_read_tile_header)( void * p_codec, + OPJ_UINT32 * p_tile_index, + OPJ_UINT32* p_data_size, + OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0, + OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1, + OPJ_UINT32 * p_nb_comps, + opj_bool * p_should_go_on, + struct opj_stream_private *p_cio, + struct opj_event_mgr * p_manager); + /** FIXME DOC */ + opj_bool (*opj_decode_tile_data)( void * p_codec, + OPJ_UINT32 p_tile_index, + OPJ_BYTE * p_data, + OPJ_UINT32 p_data_size, + struct opj_stream_private *p_cio, + struct opj_event_mgr * p_manager); + /** Reading function used after codestream if necessary */ + opj_bool (* opj_end_decompress) ( void *p_codec, + struct opj_stream_private *cio, + struct opj_event_mgr * p_manager); + /** Codec destroy function handler*/ + void (*opj_destroy) (void * p_codec); + /** Setup decoder function handler */ + void (*opj_setup_decoder) (void * p_codec, opj_dparameters_t * p_param); + /** Set decode area function handler */ + opj_bool (*opj_set_decode_area) ( void * p_codec, + opj_image_t* p_image, + OPJ_INT32 p_start_x, OPJ_INT32 p_end_x, + OPJ_INT32 p_start_y, OPJ_INT32 p_end_y, + struct opj_event_mgr * p_manager); + + /** Get tile function */ + opj_bool (*opj_get_decoded_tile) ( void *p_codec, + opj_stream_private_t *p_cio, + opj_image_t *p_image, + struct opj_event_mgr * p_manager, + OPJ_UINT32 tile_index); + + /** Set the decoded resolution factor */ + opj_bool (*opj_set_decoded_resolution_factor) ( void * p_codec, + OPJ_UINT32 res_factor, + opj_event_mgr_t * p_manager); + +}opj_decompression_t; + +typedef struct opj_compression +{ + opj_bool (* opj_start_compress) ( void *p_codec, + struct opj_stream_private *cio, + struct opj_image * p_image, + struct opj_event_mgr * p_manager); + + opj_bool (* opj_encode) ( void * p_codec, + struct opj_stream_private *p_cio, + struct opj_event_mgr * p_manager); + + opj_bool (* opj_write_tile) ( void * p_codec, + OPJ_UINT32 p_tile_index, + OPJ_BYTE * p_data, + OPJ_UINT32 p_data_size, + struct opj_stream_private * p_cio, + struct opj_event_mgr * p_manager); + + opj_bool (* opj_end_compress) ( void * p_codec, + struct opj_stream_private *p_cio, + struct opj_event_mgr * p_manager); + + void (* opj_destroy) (void * p_codec); + + void (*opj_setup_encoder) ( void * p_codec, + opj_cparameters_t * p_param, + struct opj_image * p_image, + struct opj_event_mgr * p_manager); + +}opj_compression_t; + +typedef struct opj_codec_private +{ + /** FIXME DOC */ + union + { + opj_decompression_t m_decompression; + opj_compression_t m_compression; + } m_codec_data; + /** FIXME DOC*/ + void * m_codec; + /** Event handler */ + opj_event_mgr_t m_event_mgr; + /** Flag to indicate if the codec is used to decode or encode*/ + opj_bool is_decompressor; + void (*opj_dump_codec) (void * p_codec, OPJ_INT32 info_flag, FILE* output_stream); + opj_codestream_info_v2_t* (*opj_get_codec_info)(void* p_codec); + opj_codestream_index_t* (*opj_get_codec_index)(void* p_codec); +} +opj_codec_private_t; + +static opj_bool opj_jp2_write_jp( opj_jp2_v2_t *jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + /* 12 bytes will be read */ + unsigned char l_signature_data [12]; + + /* preconditions */ + assert(cio != 00); + assert(jp2 != 00); + assert(p_manager != 00); + + /* write box length */ + opj_write_bytes(l_signature_data,12,4); + /* writes box type */ + opj_write_bytes(l_signature_data+4,JP2_JP,4); + /* writes magic number*/ + opj_write_bytes(l_signature_data+8,0x0d0a870a,4); + + if (opj_stream_write_data(cio,l_signature_data,12,p_manager) != 12) { + return OPJ_FALSE; + } + + return OPJ_TRUE; +} + +static opj_bool opj_jp2_write_ftyp(opj_jp2_v2_t *jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + unsigned int i; + unsigned int l_ftyp_size = 16 + 4 * jp2->numcl; + unsigned char * l_ftyp_data, * l_current_data_ptr; + opj_bool l_result; + + /* preconditions */ + assert(cio != 00); + assert(jp2 != 00); + assert(p_manager != 00); + + l_ftyp_data = (unsigned char *) opj_malloc(l_ftyp_size); + + if (l_ftyp_data == 00) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle ftyp data\n"); + return OPJ_FALSE; + } + + memset(l_ftyp_data,0,l_ftyp_size); + + l_current_data_ptr = l_ftyp_data; + + opj_write_bytes(l_current_data_ptr, l_ftyp_size,4); /* box size */ + l_current_data_ptr += 4; + + opj_write_bytes(l_current_data_ptr, JP2_FTYP,4); /* FTYP */ + l_current_data_ptr += 4; + + opj_write_bytes(l_current_data_ptr, jp2->brand,4); /* BR */ + l_current_data_ptr += 4; + + opj_write_bytes(l_current_data_ptr, jp2->minversion,4); /* MinV */ + l_current_data_ptr += 4; + + for (i = 0; i < jp2->numcl; i++) { + opj_write_bytes(l_current_data_ptr, jp2->cl[i],4); /* CL */ + } + + l_result = (opj_stream_write_data(cio,l_ftyp_data,l_ftyp_size,p_manager) == l_ftyp_size); + if (! l_result) + { + opj_event_msg_v2(p_manager, EVT_ERROR, "Error while writing ftyp data to stream\n"); + } + + opj_free(l_ftyp_data); + + return l_result; +} + +static opj_bool opj_jp2_default_validation ( opj_jp2_v2_t * jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager + ) +{ + opj_bool l_is_valid = OPJ_TRUE; + unsigned int i; + + /* preconditions */ + assert(jp2 != 00); + assert(cio != 00); + assert(p_manager != 00); + + /* JPEG2000 codec validation */ + /*TODO*/ + + /* STATE checking */ + /* make sure the state is at 0 */ + l_is_valid &= (jp2->jp2_state == JP2_STATE_NONE); + + /* make sure not reading a jp2h ???? WEIRD */ + l_is_valid &= (jp2->jp2_img_state == JP2_IMG_STATE_NONE); + + /* POINTER validation */ + /* make sure a j2k codec is present */ + l_is_valid &= (jp2->j2k != 00); + + /* make sure a procedure list is present */ + l_is_valid &= (jp2->m_procedure_list != 00); + + /* make sure a validation list is present */ + l_is_valid &= (jp2->m_validation_list != 00); + + /* PARAMETER VALIDATION */ + /* number of components */ + l_is_valid &= (jp2->numcl > 0); + /* width */ + l_is_valid &= (jp2->h > 0); + /* height */ + l_is_valid &= (jp2->w > 0); + /* precision */ + for (i = 0; i < jp2->numcomps; ++i) { + l_is_valid &= (jp2->comps[i].bpcc > 0); + } + + /* METH */ + l_is_valid &= ((jp2->meth > 0) && (jp2->meth < 3)); + + /* stream validation */ + /* back and forth is needed */ + l_is_valid &= opj_stream_has_seek(cio); + + return l_is_valid; +} + +static void opj_jp2_setup_encoding_validation (opj_jp2_v2_t *jp2) +{ + /* preconditions */ + assert(jp2 != 00); + + opj_procedure_list_add_procedure(jp2->m_validation_list, (opj_procedure)opj_jp2_default_validation); + /* DEVELOPER CORNER, add your custom validation procedure */ +} + +static opj_bool opj_jp2_skip_jp2c( opj_jp2_v2_t *jp2, + opj_stream_private_t *stream, + opj_event_mgr_t * p_manager ) +{ + /* preconditions */ + assert(jp2 != 00); + assert(stream != 00); + assert(p_manager != 00); + + jp2->j2k_codestream_offset = opj_stream_tell(stream); + + if (opj_stream_skip(stream,8,p_manager) != 8) { + return OPJ_FALSE; + } + + return OPJ_TRUE; +} + +static opj_bool opj_jpip_skip_iptr( opj_jp2_v2_t *jp2, + opj_stream_private_t *stream, + opj_event_mgr_t * p_manager ) +{ + /* preconditions */ + assert(jp2 != 00); + assert(stream != 00); + assert(p_manager != 00); + + jp2->jpip_iptr_offset = opj_stream_tell(stream); + + if (opj_stream_skip(stream,24,p_manager) != 24) { + return OPJ_FALSE; + } + + return OPJ_TRUE; +} + +void opj_jpip_setup_header_writing (opj_jp2_v2_t *jp2) +{ + /* preconditions */ + assert(jp2 != 00); + + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_ftyp ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2h ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_skip_iptr ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_skip_jp2c ); + + /* DEVELOPER CORNER, insert your custom procedures */ + +} + +static opj_bool opj_jp2_exec ( opj_jp2_v2_t * jp2, + opj_procedure_list_t * p_procedure_list, + opj_stream_private_t *stream, + opj_event_mgr_t * p_manager + ) + +{ + opj_bool (** l_procedure) (opj_jp2_v2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *) = 00; + opj_bool l_result = OPJ_TRUE; + OPJ_UINT32 l_nb_proc, i; + + /* preconditions */ + assert(p_procedure_list != 00); + assert(jp2 != 00); + assert(stream != 00); + assert(p_manager != 00); + + l_nb_proc = opj_procedure_list_get_nb_procedures(p_procedure_list); + l_procedure = (opj_bool (**) (opj_jp2_v2_t * jp2, opj_stream_private_t *, opj_event_mgr_t *)) opj_procedure_list_get_first_procedure(p_procedure_list); + + for (i=0;im_validation_list,stream,p_manager)) { + return OPJ_FALSE; + } + + /* customization of the encoding */ + opj_jpip_setup_header_writing(jp2); + + /* write header */ + if (! opj_jp2_exec (jp2,jp2->m_procedure_list,stream,p_manager)) { + return OPJ_FALSE; + } + + return opj_j2k_start_compress(jp2->j2k,stream,p_image,p_manager); +} + +static opj_bool opj_jpip_write_iptr(opj_jp2_v2_t *jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_OFF_T j2k_codestream_exit; + OPJ_BYTE l_data_header [24]; + + /* preconditions */ + assert(jp2 != 00); + assert(cio != 00); + assert(p_manager != 00); + assert(opj_stream_has_seek(cio)); + + j2k_codestream_exit = opj_stream_tell(cio); + opj_write_bytes(l_data_header, 24, 4); /* size of iptr */ + opj_write_bytes(l_data_header + 4,JPIP_IPTR,4); /* IPTR */ +#if 0 + opj_write_bytes(l_data_header + 4 + 4, 0, 8); /* offset */ + opj_write_bytes(l_data_header + 8 + 8, 0, 8); /* length */ +#else + opj_write_double(l_data_header + 4 + 4, 0); /* offset */ + opj_write_double(l_data_header + 8 + 8, 0); /* length */ +#endif + + if (! opj_stream_seek(cio,jp2->jpip_iptr_offset,p_manager)) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + if (opj_stream_write_data(cio,l_data_header,24,p_manager) != 24) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + return OPJ_TRUE; +} + +static opj_bool opj_jpip_write_fidx(opj_jp2_v2_t *jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_OFF_T j2k_codestream_exit; + OPJ_BYTE l_data_header [24]; + + /* preconditions */ + assert(jp2 != 00); + assert(cio != 00); + assert(p_manager != 00); + assert(opj_stream_has_seek(cio)); + + opj_write_bytes(l_data_header, 24, 4); /* size of iptr */ + opj_write_bytes(l_data_header + 4,JPIP_FIDX,4); /* IPTR */ + opj_write_double(l_data_header + 4 + 4, 0); /* offset */ + opj_write_double(l_data_header + 8 + 8, 0); /* length */ + + if (opj_stream_write_data(cio,l_data_header,24,p_manager) != 24) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + j2k_codestream_exit = opj_stream_tell(cio); + if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + return OPJ_TRUE; +} + +static opj_bool opj_jpip_write_cidx(opj_jp2_v2_t *jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_OFF_T j2k_codestream_exit; + OPJ_BYTE l_data_header [24]; + + /* preconditions */ + assert(jp2 != 00); + assert(cio != 00); + assert(p_manager != 00); + assert(opj_stream_has_seek(cio)); + + j2k_codestream_exit = opj_stream_tell(cio); + opj_write_bytes(l_data_header, 24, 4); /* size of iptr */ + opj_write_bytes(l_data_header + 4,JPIP_CIDX,4); /* IPTR */ +#if 0 + opj_write_bytes(l_data_header + 4 + 4, 0, 8); /* offset */ + opj_write_bytes(l_data_header + 8 + 8, 0, 8); /* length */ +#else + opj_write_double(l_data_header + 4 + 4, 0); /* offset */ + opj_write_double(l_data_header + 8 + 8, 0); /* length */ +#endif + + if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + if (opj_stream_write_data(cio,l_data_header,24,p_manager) != 24) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + j2k_codestream_exit = opj_stream_tell(cio); + if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + return OPJ_TRUE; +} + +static void write_prxy_v2( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_BYTE l_data_header [8]; + int len, lenp; + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_PRXY, 4); /* IPTR */ +#else + lenp = opj_stream_tell(cio); + opj_stream_skip(cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_PRXY,4); /* IPTR */ + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + +#if 0 + cio_write( cio, offset_jp2c, 8); /* OOFF */ + cio_write( cio, length_jp2c, 4); /* OBH part 1 */ + cio_write( cio, JP2_JP2C, 4); /* OBH part 2 */ +#else + opj_write_bytes( l_data_header, offset_jp2c, 8); /* OOFF */ + opj_stream_write_data(cio,l_data_header,8,p_manager); + opj_write_bytes( l_data_header, length_jp2c, 4); /* OBH part 1 */ + opj_write_bytes( l_data_header+4, JP2_JP2C, 4); /* OBH part 2 */ + opj_stream_write_data(cio,l_data_header,8,p_manager); +#endif + +#if 0 + cio_write( cio, 1,1); /* NI */ +#else + opj_write_bytes( l_data_header, 1, 1);/* NI */ + opj_stream_write_data(cio,l_data_header,1,p_manager); +#endif + +#if 0 + cio_write( cio, offset_idx, 8); /* IOFF */ + cio_write( cio, length_idx, 4); /* IBH part 1 */ + cio_write( cio, JPIP_CIDX, 4); /* IBH part 2 */ +#else + opj_write_bytes( l_data_header, offset_idx, 8); /* IOFF */ + opj_stream_write_data(cio,l_data_header,8,p_manager); + opj_write_bytes( l_data_header, length_idx, 4); /* IBH part 1 */ + opj_write_bytes( l_data_header+4, JPIP_CIDX, 4); /* IBH part 2 */ + opj_stream_write_data(cio,l_data_header,8,p_manager); +#endif + +#if 0 + len = cio_tell( cio)-lenp; + cio_seek( cio, lenp); + cio_write( cio, len, 4); /* L */ + cio_seek( cio, lenp+len); +#else + len = opj_stream_tell(cio)-lenp; + opj_stream_skip(cio, lenp, p_manager); + opj_write_bytes(l_data_header,len,4);/* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek(cio, lenp+len,p_manager); +#endif +} + + +static int write_fidx_v2( int offset_jp2c, int length_jp2c, int offset_idx, int length_idx, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_BYTE l_data_header [4]; + int len, lenp; + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_FIDX, 4); /* IPTR */ +#else + lenp = opj_stream_tell(cio); + opj_stream_skip(cio, 4, p_manager); + opj_write_bytes(l_data_header,JPIP_FIDX,4); /* FIDX */ + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + + write_prxy_v2( offset_jp2c, length_jp2c, offset_idx, length_idx, cio,p_manager); + +#if 0 + len = cio_tell( cio)-lenp; + cio_seek( cio, lenp); + cio_write( cio, len, 4); /* L */ + cio_seek( cio, lenp+len); +#else + len = opj_stream_tell(cio)-lenp; + opj_stream_skip(cio, lenp, p_manager); + opj_write_bytes(l_data_header,len,4);/* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek(cio, lenp+len,p_manager); +#endif + + return len; +} + +static opj_bool opj_jpip_write_jp2c(opj_jp2_v2_t *jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_OFF_T j2k_codestream_exit; + OPJ_BYTE l_data_header [8]; + OPJ_UINT32 len_jp2c; + int len_cidx; + int len_fidx; + int pos_jp2c; + int pos_fidx; + int pos_cidx; + + /* preconditions */ + assert(jp2 != 00); + assert(cio != 00); + assert(p_manager != 00); + assert(opj_stream_has_seek(cio)); + + j2k_codestream_exit = opj_stream_tell(cio); + len_jp2c = j2k_codestream_exit - jp2->j2k_codestream_offset; + pos_jp2c = jp2->j2k_codestream_offset; + opj_write_bytes(l_data_header, len_jp2c, 4); /* size of codestream */ + opj_write_bytes(l_data_header + 4,JP2_JP2C,4); /* JP2C */ + + if (! opj_stream_seek(cio,jp2->j2k_codestream_offset,p_manager)) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + if (opj_stream_write_data(cio,l_data_header,8,p_manager) != 8) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + if (! opj_stream_seek(cio,j2k_codestream_exit,p_manager)) { + opj_event_msg_v2(p_manager, EVT_ERROR, "Failed to seek in the stream.\n"); + return OPJ_FALSE; + } + + /* CIDX */ + pos_cidx = opj_stream_tell( cio); + len_cidx = write_cidx_v2( pos_jp2c+8, cio, jp2_get_cstr_info(jp2), len_jp2c-8); + + /* FIDX */ + pos_fidx = opj_stream_tell( cio); + len_fidx = write_fidx_v2( pos_jp2c, len_jp2c, pos_cidx, len_cidx, cio, p_manager); + + return OPJ_TRUE; +} + +static void opj_jp2_setup_end_header_writing (opj_jp2_v2_t *jp2) +{ + /* preconditions */ + assert(jp2 != 00); + + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_iptr ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_jp2c ); +#if 0 + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_cidx ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jpip_write_fidx ); +#endif + /* DEVELOPER CORNER, add your custom procedures */ +} + +opj_bool opj_jpip_end_compress( opj_jp2_v2_t *jp2, + opj_stream_private_t *cio, + opj_event_mgr_t * p_manager + ) +{ + /* preconditions */ + assert(jp2 != 00); + assert(cio != 00); + assert(p_manager != 00); + + /* customization of the end encoding */ + opj_jp2_setup_end_header_writing(jp2); + + if (! opj_j2k_end_compress(jp2->j2k,cio,p_manager)) { + return OPJ_FALSE; + } + + /* write header */ + return opj_jp2_exec(jp2,jp2->m_procedure_list,cio,p_manager); +} + + +opj_codec_t* OPJ_CALLCONV opj_jpip_create_compress(OPJ_CODEC_FORMAT p_format) +{ + opj_codec_private_t *l_codec = 00; + + l_codec = (opj_codec_private_t*)opj_calloc(1, sizeof(opj_codec_private_t)); + if (!l_codec) { + return 00; + } + memset(l_codec, 0, sizeof(opj_codec_private_t)); + + l_codec->is_decompressor = 0; + + switch(p_format) { + case CODEC_JP2: + /* get a JP2 decoder handle */ + l_codec->m_codec_data.m_compression.opj_encode = (opj_bool (*) (void *, + struct opj_stream_private *, + struct opj_event_mgr * )) opj_jp2_encode; + + l_codec->m_codec_data.m_compression.opj_end_compress = (opj_bool (*) ( void *, + struct opj_stream_private *, + struct opj_event_mgr *)) opj_jpip_end_compress; + + l_codec->m_codec_data.m_compression.opj_start_compress = (opj_bool (*) (void *, + struct opj_stream_private *, + struct opj_image * , + struct opj_event_mgr *)) opj_jpip_start_compress; + + l_codec->m_codec_data.m_compression.opj_write_tile = (opj_bool (*) (void *, + OPJ_UINT32, + OPJ_BYTE*, + OPJ_UINT32, + struct opj_stream_private *, + struct opj_event_mgr *)) opj_jp2_write_tile; + + l_codec->m_codec_data.m_compression.opj_destroy = (void (*) (void *)) opj_jp2_destroy; + + l_codec->m_codec_data.m_compression.opj_setup_encoder = (void (*) ( void *, + opj_cparameters_t *, + struct opj_image *, + struct opj_event_mgr * )) opj_jp2_setup_encoder; + + l_codec->m_codec = opj_jp2_create(OPJ_FALSE); + if (! l_codec->m_codec) { + opj_free(l_codec); + return 00; + } + + break; + + case CODEC_UNKNOWN: + case CODEC_JPT: + default: + opj_free(l_codec); + return 00; + } + + opj_set_default_event_handler(&(l_codec->m_event_mgr)); + return (opj_codec_t*) l_codec; +} + #endif /*SERVER*/ diff --git a/src/lib/openjpip/openjpip.h b/src/lib/openjpip/openjpip.h index c08c3d86..5255ab9c 100644 --- a/src/lib/openjpip/openjpip.h +++ b/src/lib/openjpip/openjpip.h @@ -303,6 +303,8 @@ void destroy_index( index_t **idx); */ void output_index( index_t *index); +OPJ_API opj_codec_t* OPJ_CALLCONV opj_jpip_create_compress(OPJ_CODEC_FORMAT format); + #endif /*SERVER*/ #endif /* !OPENJPIP_H_ */ diff --git a/src/lib/openjpip/phix_manager.c b/src/lib/openjpip/phix_manager.c index 0e2e5704..c37ba007 100644 --- a/src/lib/openjpip/phix_manager.c +++ b/src/lib/openjpip/phix_manager.c @@ -81,6 +81,60 @@ int write_phix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int return len; } +int write_phix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_BYTE l_data_header [8]; + int len, lenp=0, compno, i; + opj_jp2_box_t *box; + + box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t)); + + for( i=0;i<2;i++){ + if (i) +#if 0 + cio_seek( cio, lenp); +#else + opj_stream_seek( cio, lenp, p_manager); +#endif + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_PHIX, 4); /* PHIX */ +#else + lenp = opj_stream_tell(cio); + opj_stream_skip(cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_PHIX,4); /* PHIX */ + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + + write_manf_v2( i, cstr_info.numcomps, box, cio); + + for( compno=0; compno pow( 2, 32)){ + size_of_coding = 8; + version = 1; + } + else{ + size_of_coding = 4; + version = 0; + } + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_FAIX, 4); /* FAIX */ + cio_write( cio, version,1); /* Version 0 = 4 bytes */ +#else + lenp = opj_stream_tell(cio); + opj_stream_skip(cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_write_bytes(l_data_header,version,1); /* Version 0 = 4 bytes */ + opj_stream_write_data(cio,l_data_header,1,p_manager); +#endif + + nmax = 0; + for( i=0; i<=cstr_info.numdecompos[compno]; i++) + nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers; + +#if 0 + cio_write( cio, nmax, size_of_coding); /* NMAX */ + cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding); /* M */ +#else + opj_write_bytes(l_data_header,nmax,size_of_coding); /* NMAX */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding); /* M */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); +#endif + + for( tileno=0; tilenopw[resno]*tile_Idx->ph[resno]; + for( precno=0; precnopacket[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno]; + break; + case RLCP: + packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno]; + break; + case RPCL: + packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno]; + break; + case PCRL: + packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno]; + break; + case CPRL: + packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno]; + break; + default: + fprintf( stderr, "failed to ppix indexing\n"); + } + +#if 0 + cio_write( cio, packet.start_pos-coff, size_of_coding); /* start position */ + cio_write( cio, packet.end_ph_pos-packet.start_pos+1, size_of_coding); /* length */ +#else + opj_write_bytes(l_data_header,packet.start_pos-coff,size_of_coding); /* start position */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,packet.end_ph_pos-packet.start_pos+1,size_of_coding); /* length */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); +#endif + + num_packet++; + } + } + } + + /* PADDING */ + while( num_packet < nmax){ +#if 0 + cio_write( cio, 0, size_of_coding); /* start position */ + cio_write( cio, 0, size_of_coding); /* length */ +#else + opj_write_bytes(l_data_header,0,size_of_coding);/* start position */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,0,size_of_coding);/* length */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); +#endif + num_packet++; + } + } + +#if 0 + len = cio_tell( cio)-lenp; + cio_seek( cio, lenp); + cio_write( cio, len, 4); /* L */ + cio_seek( cio, lenp+len); +#else + len = opj_stream_tell(cio)-lenp; + opj_stream_seek(cio, lenp,p_manager); + opj_write_bytes(l_data_header,len,4);/* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek(cio, lenp+len,p_manager); +#endif + + return len; +} diff --git a/src/lib/openjpip/ppix_manager.c b/src/lib/openjpip/ppix_manager.c index 5afbbfd7..6eb70bcc 100644 --- a/src/lib/openjpip/ppix_manager.c +++ b/src/lib/openjpip/ppix_manager.c @@ -83,6 +83,63 @@ int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int return len; } +int write_ppix_v2( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_BYTE l_data_header [4]; + int len, lenp, compno, i; + opj_jp2_box_t *box; + + /* printf("cstr_info.packno %d\n", cstr_info.packno); //NMAX? */ + + lenp = -1; + box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t)); + + for (i=0;i<2;i++){ + if (i) +#if 0 + cio_seek( cio, lenp); +#else + opj_stream_seek( cio, lenp, p_manager); +#endif + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_PPIX, 4); /* PPIX */ +#else + lenp = opj_stream_tell(cio); + opj_stream_skip( cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_PPIX,4);/* PPIX */ + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + + write_manf_v2( i, cstr_info.numcomps, box, cio); + + for (compno=0; compno pow( 2, 32)){ + size_of_coding = 8; + version = 1; + } + else{ + size_of_coding = 4; + version = 0; + } + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_FAIX, 4); /* FAIX */ + cio_write( cio, version, 1); /* Version 0 = 4 bytes */ +#else + lenp = opj_stream_tell(cio); + opj_stream_skip(cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */ + opj_write_bytes(l_data_header,version,1); + opj_stream_write_data(cio,l_data_header,1,p_manager);/* Version 0 = 4 bytes */ +#endif + + nmax = 0; + for( i=0; i<=cstr_info.numdecompos[compno]; i++) + nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers; + +#if 0 + cio_write( cio, nmax, size_of_coding); /* NMAX */ + cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding); /* M */ +#else + opj_write_bytes(l_data_header,nmax,size_of_coding); /* NMAX */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding); /* M */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); +#endif + + for( tileno=0; tilenopw[resno]*tile_Idx->ph[resno]; + for( precno=0; precnopacket[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno]; + break; + case RLCP: + packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno]; + break; + case RPCL: + packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno]; + break; + case PCRL: + packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno]; + break; + case CPRL: + packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno]; + break; + default: + fprintf( stderr, "failed to ppix indexing\n"); + } + +#if 0 + cio_write( cio, packet.start_pos-coff, size_of_coding); /* start position */ + cio_write( cio, packet.end_pos-packet.start_pos+1, size_of_coding); /* length */ +#else + opj_write_bytes(l_data_header,packet.start_pos-coff,size_of_coding); /* start position */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,packet.end_pos-packet.start_pos+1,size_of_coding); /* length */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); +#endif + + num_packet++; + } + } + } + + while( num_packet < nmax){ /* PADDING */ +#if 0 + cio_write( cio, 0, size_of_coding); /* start position */ + cio_write( cio, 0, size_of_coding); /* length */ +#else + opj_write_bytes(l_data_header,0,size_of_coding);/* start position */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,0,size_of_coding);/* length */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); +#endif + num_packet++; + } + } + +#if 0 + len = cio_tell( cio)-lenp; + cio_seek( cio, lenp); + cio_write( cio, len, 4); /* L */ + cio_seek( cio, lenp+len); +#else + len = opj_stream_tell(cio)-lenp; + opj_stream_seek(cio, lenp,p_manager); + opj_write_bytes(l_data_header,len,4);/* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek(cio, lenp+len,p_manager); +#endif + + return len; +} diff --git a/src/lib/openjpip/session_manager.c b/src/lib/openjpip/session_manager.c index 5d9dd73e..24b1d0ce 100644 --- a/src/lib/openjpip/session_manager.c +++ b/src/lib/openjpip/session_manager.c @@ -48,7 +48,7 @@ sessionlist_param_t * gene_sessionlist(void) { sessionlist_param_t *sessionlist; - sessionlist = (sessionlist_param_t *)malloc( sizeof(sessionlist_param_t)); + sessionlist = (sessionlist_param_t *)opj_malloc( sizeof(sessionlist_param_t)); sessionlist->first = NULL; sessionlist->last = NULL; @@ -60,7 +60,7 @@ session_param_t * gene_session( sessionlist_param_t *sessionlist) { session_param_t *session; - session = (session_param_t *)malloc( sizeof(session_param_t)); + session = (session_param_t *)opj_malloc( sizeof(session_param_t)); session->channellist = gene_channellist(); session->cachemodellist = gene_cachemodellist(); @@ -144,7 +144,7 @@ bool delete_session( session_param_t **session, sessionlist_param_t *sessionlist #ifndef SERVER fprintf( logstream, "local log: session: %p deleted!\n", (void *)(*session)); #endif - free( *session); + opj_free( *session); return true; } @@ -163,7 +163,7 @@ void delete_sessionlist( sessionlist_param_t **sessionlist) #ifndef SERVER fprintf( logstream, "local log: session: %p deleted!\n", (void *)sessionPtr); #endif - free( sessionPtr); + opj_free( sessionPtr); sessionPtr=sessionNext; } @@ -171,7 +171,7 @@ void delete_sessionlist( sessionlist_param_t **sessionlist) (*sessionlist)->first = NULL; (*sessionlist)->last = NULL; - free(*sessionlist); + opj_free(*sessionlist); } void print_allsession( sessionlist_param_t *sessionlist) diff --git a/src/lib/openjpip/target_manager.c b/src/lib/openjpip/target_manager.c index 72d2f564..92fb93cf 100644 --- a/src/lib/openjpip/target_manager.c +++ b/src/lib/openjpip/target_manager.c @@ -58,7 +58,7 @@ targetlist_param_t * gene_targetlist(void) { targetlist_param_t *targetlist; - targetlist = (targetlist_param_t *)malloc( sizeof(targetlist_param_t)); + targetlist = (targetlist_param_t *)opj_malloc( sizeof(targetlist_param_t)); targetlist->first = NULL; targetlist->last = NULL; @@ -99,7 +99,7 @@ target_param_t * gene_target( targetlist_param_t *targetlist, char *targetpath) return NULL; } - target = (target_param_t *)malloc( sizeof(target_param_t)); + target = (target_param_t *)opj_malloc( sizeof(target_param_t)); snprintf( target->tid, MAX_LENOFTID, "%x-%x", (unsigned int)time(NULL), (unsigned int)rand()); target->targetname = strdup( targetpath); target->fd = fd; @@ -158,9 +158,9 @@ void delete_target( target_param_t **target) fprintf( logstream, "local log: target: %s deleted\n", (*target)->targetname); #endif - free( (*target)->targetname); + opj_free( (*target)->targetname); - free(*target); + opj_free(*target); } void delete_target_in_list( target_param_t **target, targetlist_param_t *targetlist) @@ -193,7 +193,7 @@ void delete_targetlist(targetlist_param_t **targetlist) delete_target( &targetPtr); targetPtr=targetNext; } - free( *targetlist); + opj_free( *targetlist); } void print_target( target_param_t *target) @@ -274,10 +274,10 @@ int open_jp2file( const char filepath[], char tmpfname[]) return -1; } - data = (char *)malloc( 12); /* size of header*/ + data = (char *)opj_malloc( 12); /* size of header*/ if( read( fd, data, 12) != 12){ - free( data); + opj_free( data); close(fd); fprintf( FCGI_stdout, "Reason: Target %s broken (read error)\r\n", filepath); return -1; @@ -285,13 +285,13 @@ int open_jp2file( const char filepath[], char tmpfname[]) if( *data || *(data + 1) || *(data + 2) || *(data + 3) != 12 || strncmp (data + 4, "jP \r\n\x87\n", 8)){ - free( data); + opj_free( data); close(fd); fprintf( FCGI_stdout, "Reason: No JPEG 2000 Signature box in target %s\r\n", filepath); return -1; } - free( data); + opj_free( data); return fd; } diff --git a/src/lib/openjpip/thix_manager.c b/src/lib/openjpip/thix_manager.c index 38054886..a7d71a7a 100644 --- a/src/lib/openjpip/thix_manager.c +++ b/src/lib/openjpip/thix_manager.c @@ -80,6 +80,61 @@ int write_thix( int coff, opj_codestream_info_t cstr_info, opj_cio_t *cio) return len; } +int write_thix_v2( int coff, opj_codestream_info_t cstr_info, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_BYTE l_data_header [4]; + int len, lenp, i; + int tileno; + opj_jp2_box_t *box; + + lenp = 0; + box = (opj_jp2_box_t *)opj_calloc( cstr_info.tw*cstr_info.th, sizeof(opj_jp2_box_t)); + + for ( i = 0; i < 2 ; i++ ){ + if (i) +#if 0 + cio_seek( cio, lenp); +#else + opj_stream_seek( cio, lenp, p_manager); +#endif + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_THIX, 4); /* THIX */ +#else + lenp = opj_stream_tell(cio); + opj_stream_skip(cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_THIX,4); /* THIX */ + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + write_manf_v2( i, cstr_info.tw*cstr_info.th, box, cio); + + for (tileno = 0; tileno < cstr_info.tw*cstr_info.th; tileno++){ + box[tileno].length = write_tilemhix_v2( coff, cstr_info, tileno, cio); + box[tileno].type = JPIP_MHIX; + } + +#if 0 + len = cio_tell( cio)-lenp; + cio_seek( cio, lenp); + cio_write( cio, len, 4); /* L */ + cio_seek( cio, lenp+len); +#else + len = opj_stream_tell(cio)-lenp; + opj_stream_seek(cio, lenp, p_manager); + opj_write_bytes(l_data_header,len,4); /* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek( cio, lenp+len,p_manager); +#endif + } + + opj_free(box); + + return len; +} + int write_tilemhix( int coff, opj_codestream_info_t cstr_info, int tileno, opj_cio_t *cio) { int i; @@ -116,3 +171,72 @@ int write_tilemhix( int coff, opj_codestream_info_t cstr_info, int tileno, opj_c return len; } + +int write_tilemhix_v2( int coff, opj_codestream_info_t cstr_info, int tileno, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + OPJ_BYTE l_data_header [8]; + int i; + opj_tile_info_t tile; + opj_tp_info_t tp; + int marknum; + int len, lenp; + opj_marker_info_t *marker; + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_MHIX, 4); /* MHIX */ +#else + lenp = opj_stream_tell (cio); + opj_stream_skip(cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_MHIX,4); /* MHIX */ + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + + tile = cstr_info.tile[tileno]; + tp = tile.tp[0]; + +#if 0 + cio_write( cio, tp.tp_end_header-tp.tp_start_pos+1, 8); /* TLEN */ +#else + opj_write_bytes(l_data_header,tp.tp_end_header-tp.tp_start_pos+1, 8); /* TLEN */ + opj_stream_write_data(cio,l_data_header,8,p_manager); +#endif + + marker = cstr_info.tile[tileno].marker; + + for( i=0; i 1) - Aux = cstr_info.numdecompos[compno] + 1; - else - Aux = j + 1; - - cio_write( cio, Aux,4); - /*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */ - /* fprintf(stderr,"AUX value %d\n",Aux);*/ + if( cstr_info.tile[i].num_tps == 1 && cstr_info.numdecompos[compno] > 1) + Aux = cstr_info.numdecompos[compno] + 1; + else + Aux = j + 1; + + cio_write( cio, Aux,4); + /*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */ + /* fprintf(stderr,"AUX value %d\n",Aux);*/ } /*cio_write(0,4);*/ } @@ -127,7 +160,7 @@ int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j cio_write( cio, 0, size_of_coding); /* start position */ cio_write( cio, 0, size_of_coding); /* length */ if (version & 0x02) - cio_write( cio, 0,4); /* Aux_i,j : Auxiliary value */ + cio_write( cio, 0,4); /* Aux_i,j : Auxiliary value */ j++; } } @@ -141,6 +174,123 @@ int write_tpixfaix( int coff, int compno, opj_codestream_info_t cstr_info, int j } +int write_tpixfaix_v2( int coff, int compno, opj_codestream_info_t cstr_info, int j2klen, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) +{ + int len, lenp; + int i, j; + int Aux; + int num_max_tile_parts; + int size_of_coding; /* 4 or 8 */ + opj_tp_info_t tp; + OPJ_BYTE l_data_header [8]; + int version; + + num_max_tile_parts = get_num_max_tile_parts( cstr_info); + + if( j2klen > pow( 2, 32)){ + size_of_coding = 8; + version = num_max_tile_parts == 1 ? 1:3; + } + else{ + size_of_coding = 4; + version = num_max_tile_parts == 1 ? 0:2; + } + +#if 0 + lenp = cio_tell( cio); + cio_skip( cio, 4); /* L [at the end] */ + cio_write( cio, JPIP_FAIX, 4); /* FAIX */ + cio_write( cio, version, 1); /* Version 0 = 4 bytes */ +#else + lenp = opj_stream_tell(cio); + opj_stream_skip(cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_write_bytes(l_data_header,version,1); /* Version 0 = 4 bytes */ + opj_stream_write_data(cio,l_data_header,1,p_manager); +#endif + +#if 0 + cio_write( cio, num_max_tile_parts, size_of_coding); /* NMAX */ + cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding); /* M */ +#else + opj_write_bytes(l_data_header,num_max_tile_parts,size_of_coding); /* NMAX */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,cstr_info.tw*cstr_info.th,size_of_coding); /* M */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); +#endif + for (i = 0; i < cstr_info.tw*cstr_info.th; i++) + { + for (j = 0; j < cstr_info.tile[i].num_tps; j++) + { + tp = cstr_info.tile[i].tp[j]; +#if 0 + cio_write( cio, tp.tp_start_pos-coff, size_of_coding); /* start position */ + cio_write( cio, tp.tp_end_pos-tp.tp_start_pos+1, size_of_coding); /* length */ +#else + opj_write_bytes(l_data_header,tp.tp_start_pos-coff,size_of_coding); /* start position */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,tp.tp_end_pos-tp.tp_start_pos+1,size_of_coding); /* length */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); +#endif + if (version & 0x02) + { + if( cstr_info.tile[i].num_tps == 1 && cstr_info.numdecompos[compno] > 1) + Aux = cstr_info.numdecompos[compno] + 1; + else + Aux = j + 1; + +#if 0 + cio_write( cio, Aux,4); +#else + opj_write_bytes(l_data_header,Aux,4); + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + /*cio_write(img.tile[i].tile_parts[j].num_reso_AUX,4);*/ /* Aux_i,j : Auxiliary value */ + /* fprintf(stderr,"AUX value %d\n",Aux);*/ + } + /*cio_write(0,4);*/ + } + /* PADDING */ + while (j < num_max_tile_parts) + { +#if 0 + cio_write( cio, 0, size_of_coding); /* start position */ + cio_write( cio, 0, size_of_coding); /* length */ +#else + opj_write_bytes(l_data_header,0,size_of_coding);/* start position */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,0,size_of_coding);/* length */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); +#endif + if (version & 0x02) +#if 0 + cio_write( cio, 0,4); /* Aux_i,j : Auxiliary value */ +#else + opj_write_bytes(l_data_header,0,4); /* Aux_i,j : Auxiliary value */ + opj_stream_write_data(cio,l_data_header,4,p_manager); +#endif + j++; + } + } + +#if 0 + len = cio_tell( cio)-lenp; + cio_seek( cio, lenp); + cio_write( cio, len, 4); /* L */ + cio_seek( cio, lenp+len); +#else + len = opj_stream_tell(cio)-lenp; + opj_stream_seek(cio, lenp,p_manager); + opj_write_bytes(l_data_header,len,4);/* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek(cio, lenp+len,p_manager); +#endif + + return len; +} + int get_num_max_tile_parts( opj_codestream_info_t cstr_info) { int num_max_tp = 0, i;