From 26606c71c8a5c3a79f9e371e1c0ddfcb800b77df Mon Sep 17 00:00:00 2001 From: Francois-Olivier Devaux Date: Mon, 10 Dec 2007 13:16:01 +0000 Subject: [PATCH] First import of JAVAOpenJPEG, a Java wrapper of OpenJPEG, developed by Patrick Piscaglia of Telemis (www.telemis.com). Thank you Patrick for this new module ! --- ChangeLog | 4 + JavaOpenJPEG/CMakeLists.txt | 53 + JavaOpenJPEG/JavaOpenJPEG.c | 1989 +++++++++++++++++ JavaOpenJPEG/JavaOpenJPEG.dsp | 110 + JavaOpenJPEG/JavaOpenJPEG.dsw | 44 + JavaOpenJPEG/JavaOpenJPEG.vcproj | 276 +++ JavaOpenJPEG/JavaOpenJPEGDecoder.c | 897 ++++++++ JavaOpenJPEG/Makefile | 14 + .../org/openJpeg/OpenJPEGJavaDecoder.java | 230 ++ .../org/openJpeg/OpenJPEGJavaEncoder.java | 318 +++ .../org_openJpeg_OpenJPEGJavaDecoder.h | 21 + .../org_openJpeg_OpenJPEGJavaEncoder.h | 21 + codec/compat/getopt.c | 8 +- codec/image_to_j2k.c | 2 +- libopenjpeg/tcd.c | 6 +- 15 files changed, 3987 insertions(+), 6 deletions(-) create mode 100644 JavaOpenJPEG/CMakeLists.txt create mode 100644 JavaOpenJPEG/JavaOpenJPEG.c create mode 100644 JavaOpenJPEG/JavaOpenJPEG.dsp create mode 100644 JavaOpenJPEG/JavaOpenJPEG.dsw create mode 100644 JavaOpenJPEG/JavaOpenJPEG.vcproj create mode 100644 JavaOpenJPEG/JavaOpenJPEGDecoder.c create mode 100644 JavaOpenJPEG/Makefile create mode 100644 JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaDecoder.java create mode 100644 JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaEncoder.java create mode 100644 JavaOpenJPEG/org_openJpeg_OpenJPEGJavaDecoder.h create mode 100644 JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h diff --git a/ChangeLog b/ChangeLog index d71b6032..6a7e59fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ What's New for OpenJPEG ! : changed + : added +December 10, 2007 ++ [FOD] First import of JAVAOpenJPEG, a Java wrapper of OpenJPEG, developed by Patrick Piscaglia of Telemis (www.telemis.com). + Thank you Patrick for this new module ! + November 29, 2007 ! [GB] Added index.h and index.c in VC6 projects; wrapped index.h in the C++ preprocessor; modified OPJViewer project and some files. diff --git a/JavaOpenJPEG/CMakeLists.txt b/JavaOpenJPEG/CMakeLists.txt new file mode 100644 index 00000000..24058463 --- /dev/null +++ b/JavaOpenJPEG/CMakeLists.txt @@ -0,0 +1,53 @@ +# Build the demo app, small examples + +# First thing define the common source: +SET(common_SRCS + convert.c + ) +# Then check if getopt is present: +INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) +SET(DONT_HAVE_GETOPT 1) +IF(UNIX) #I am pretty sure only *nix sys have this anyway + CHECK_INCLUDE_FILE("getopt.h" CMAKE_HAVE_GETOPT_H) + # Seems like we need the contrary: + IF(CMAKE_HAVE_GETOPT_H) + SET(DONT_HAVE_GETOPT 0) + ENDIF(CMAKE_HAVE_GETOPT_H) +ENDIF(UNIX) + +# If not getopt was found then add it to the lib: +IF(DONT_HAVE_GETOPT) + ADD_DEFINITIONS(-DDONT_HAVE_GETOPT) + SET(common_SRCS + ${common_SRCS} + compat/getopt.c + ) +ENDIF(DONT_HAVE_GETOPT) + + +# Headers file are located here: +INCLUDE_DIRECTORIES( + ${OPENJPEG_SOURCE_DIR}/libopenjpeg + ) + +# Do the proper thing when building static...if only there was configured +# headers or def files instead +IF(NOT BUILD_SHARED_LIBS) + ADD_DEFINITIONS(-DOPJ_STATIC) +ENDIF(NOT BUILD_SHARED_LIBS) + +FIND_PACKAGE(TIFF REQUIRED) + +# Loop over all executables: +FOREACH(exe j2k_to_image image_to_j2k) + ADD_EXECUTABLE(${exe} ${exe}.c ${common_SRCS}) + TARGET_LINK_LIBRARIES(${exe} ${OPJ_PREFIX}openjpeg ${TIFF_LIBRARIES}) + # On unix you need to link to the math library: + IF(UNIX) + TARGET_LINK_LIBRARIES(${exe} -lm) + ENDIF(UNIX) + # Install exe + INSTALL_TARGETS(/bin/ ${exe}) +ENDFOREACH(exe) + + diff --git a/JavaOpenJPEG/JavaOpenJPEG.c b/JavaOpenJPEG/JavaOpenJPEG.c new file mode 100644 index 00000000..6af3a44a --- /dev/null +++ b/JavaOpenJPEG/JavaOpenJPEG.c @@ -0,0 +1,1989 @@ +/* + * 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) 2007, Patrick Piscaglia (Telemis) + * 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 + +#include "openjpeg.h" +#include "compat/getopt.h" +#include "convert.h" +#include "index.h" +#include "dirent.h" +#include "org_openJpeg_OpenJPEGJavaEncoder.h" + +#ifndef WIN32 +#define stricmp strcasecmp +#define strnicmp strncasecmp +#endif + +/* ----------------------------------------------------------------------- */ + +#define J2K_CFMT 0 +#define JP2_CFMT 1 +#define JPT_CFMT 2 + +#define PXM_DFMT 10 +#define PGX_DFMT 11 +#define BMP_DFMT 12 +#define YUV_DFMT 13 +#define TIF_DFMT 14 +#define RAW_DFMT 15 +#define TGA_DFMT 16 + +/* ----------------------------------------------------------------------- */ +#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*/ + +extern int get_file_format(char *filename); +extern void error_callback(const char *msg, void *client_data); +extern warning_callback(const char *msg, void *client_data); +extern void info_callback(const char *msg, void *client_data); + +typedef struct callback_variables { + JNIEnv *env; + /** 'jclass' object used to call a Java method from the C */ + jobject *jobj; + /** 'jclass' object used to call a Java method from the C */ + jmethodID message_mid; + jmethodID error_mid; +} callback_variables_t; + +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() { + fprintf(stdout,"HELP\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 PGM, PPM, PNM, PGX, BMP, TIF, RAW and TGA formats\n"); + fprintf(stdout,"\n"); + fprintf(stdout,"-i : source file (-i source.pnm also *.pgm, *.ppm, *.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,"-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"); +/* 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 */ +/* < +/// Get logarithm of an integer and round downwards. +/// +int int_floorlog2(int a) { + int l; + for (l=0; a>1; l++) { + a>>=1; + } + return l; +} + +static int initialise_4K_poc(opj_poc_t *POC, int numres){ + POC[0].tile = 1; + POC[0].resno0 = 0; + POC[0].compno0 = 0; + POC[0].layno1 = 1; + POC[0].resno1 = numres-1; + POC[0].compno1 = 3; + POC[0].prg1 = CPRL; + POC[1].tile = 1; + POC[1].resno0 = numres-1; + POC[1].compno0 = 0; + POC[1].layno1 = 1; + POC[1].resno1 = numres; + POC[1].compno1 = 3; + POC[1].prg1 = CPRL; + return 2; +} + +void cinema_parameters(opj_cparameters_t *parameters){ + parameters->tile_size_on = false; + parameters->cp_tdx=1; + parameters->cp_tdy=1; + + /*Tile part*/ + parameters->tp_flag = 'C'; + parameters->tp_on = 1; + + /*Tile and Image shall be at (0,0)*/ + parameters->cp_tx0 = 0; + parameters->cp_ty0 = 0; + parameters->image_offset_x0 = 0; + parameters->image_offset_y0 = 0; + + /*Codeblock size= 32*32*/ + parameters->cblockw_init = 32; + parameters->cblockh_init = 32; + parameters->csty |= 0x01; + + /*The progression order shall be CPRL*/ + parameters->prog_order = CPRL; + + /* No ROI */ + parameters->roi_compno = -1; + + parameters->subsampling_dx = 1; parameters->subsampling_dy = 1; + + /* 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; + opj_poc_t *POC = NULL; + + switch (parameters->cp_cinema){ + case CINEMA2K_24: + case CINEMA2K_48: + if(parameters->numresolution > 6){ + parameters->numresolution = 6; + } + if (!((image->comps[0].w == 2048) | (image->comps[0].h == 1080))){ + fprintf(stdout,"Image coordinates %d x %d is not 2K compliant.\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; + } + + 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; + } + parameters->cp_disto_alloc = 1; +} + + +/* ------------------------------------------------------------------------------------ */ +int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters, + img_fol_t *img_fol, char *indexfilename) { + int i, j,totlen; + option_t long_option[]={ + {"cinema2K",REQ_ARG, NULL ,'w'}, + {"cinema4K",NO_ARG, NULL ,'y'}, + {"ImgDir",REQ_ARG, NULL ,'z'}, + {"TP",REQ_ARG, NULL ,'v'}, + {"SOP",NO_ARG, NULL ,'S'}, + {"EPH",NO_ARG, NULL ,'E'}, + {"OutFor",REQ_ARG, NULL ,'O'}, + {"POC",REQ_ARG, NULL ,'P'}, + {"ROI",REQ_ARG, NULL ,'R'}, + }; + + /* parse the command line */ +/* UniPG>> */ + const char optlist[] = "i:o:hr:q:n:b:c:t:p:s:SEM:x:R:d:T:If:P:C:F:" +#ifdef USE_JPWL + "W:" +#endif /* USE_JPWL */ + ; + + /*printf("C: parse_cmdline_encoder:"); + for (i=0; iset_out_format=0; + reset_options_reading(); + + while (1) { + int c = getopt_long(argc, argv, optlist,long_option,totlen); + if (c == -1) + break; + switch (c) { + + /* ----------------------------------------------------- */ + + case 'o': /* output file */ + { + char *outfile = 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 = 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 = optarg; + break; + default: + fprintf(stderr, "Unknown output format image [only j2k, j2c, jp2]!! \n"); + return 1; + } + } + break; + + + /* ----------------------------------------------------- */ + + + case 'r': /* rates rates/distorsion */ + { + char *s = optarg; + 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 'q': /* add fixed_quality */ + { + char *s = 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 = 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(optarg, "%d,%d", ¶meters->cp_tdx, ¶meters->cp_tdy); + parameters->tile_size_on = true; + } + break; + + /* ----------------------------------------------------- */ + + case 'n': /* resolution */ + { + sscanf(optarg, "%d", ¶meters->numresolution); + } + break; + + /* ----------------------------------------------------- */ + case 'c': /* precinct dimension */ + { + char sep; + int res_spec = 0; + + char *s = 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(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 = optarg; + strncpy(indexfilename, index, OPJ_PATH_LEN); + } + break; + + /* ----------------------------------------------------- */ + + case 'p': /* progression order */ + { + char progression[4]; + + strncpy(progression, optarg, 4); + parameters->prog_order = give_progression(progression); + if (parameters->prog_order == -1) { + fprintf(stderr, "Unrecognized progression order " + "[LRCP, RLCP, RPCL, PCRL, CPRL] !!\n"); + return 1; + } + } + break; + + /* ----------------------------------------------------- */ + + case 's': /* subsampling factor */ + { + if (sscanf(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(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 = 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(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(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(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(optarg) + 1); + if(parameters->cp_comment) { + strcpy(parameters->cp_comment, optarg); + } + } + break; + + + /* ------------------------------------------------------ */ + + case 'I': /* reversible or not */ + { + parameters->irreversible = 1; + } + break; + + /* ------------------------------------------------------ */ + + case 'v': /* Tile part generation*/ + { + parameters->tp_flag = optarg[0]; + parameters->tp_on = 1; + } + break; + + /* ------------------------------------------------------ */ + + case 'z': /* Image Directory path */ + { + img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1); + strcpy(img_fol->imgdirpath,optarg); + img_fol->set_imgdir=1; + } + break; + + /* ------------------------------------------------------ */ + + case 'w': /* Digital Cinema 2K profile compliance*/ + { + int fps=0; + sscanf(optarg,"%d",&fps); + if(fps == 24){ + parameters->cp_cinema = CINEMA2K_24; + }else if(fps == 48 ){ + parameters->cp_cinema = CINEMA2K_48; + }else { + fprintf(stderr,"Incorrect value!! must be 24 or 48\n"); + return 1; + } + fprintf(stdout,"CINEMA 2K compliant codestream\n"); + parameters->cp_rsiz = CINEMA2K; + + } + break; + + /* ------------------------------------------------------ */ + + case 'y': /* Digital Cinema 4K profile compliance*/ + { + parameters->cp_cinema = CINEMA4K_24; + fprintf(stdout,"CINEMA 4K compliant codestream\n"); + parameters->cp_rsiz = CINEMA4K; + } + break; + + /* ------------------------------------------------------ */ + +/* UniPG>> */ +#ifdef USE_JPWL + /* ------------------------------------------------------ */ + + case 'W': /* JPWL capabilities switched on */ + { + char *token = NULL; + int hprot, pprot, sens, addr, size, range; + + /* we need to enable indexing */ + if (!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(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, lastpackno = 0; + + pprot = 1; /* predefined method */ + + if (sscanf(token, "p=%d", &pprot) == 1) { + /* Method for all tiles and all packets */ + if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) || + ((pprot >= 37) && (pprot <= 128)))) { + fprintf(stderr, "ERROR -> invalid default packet protection method p = %d\n", pprot); + return 1; + } + parameters->jpwl_pprot_tileno[0] = 0; + parameters->jpwl_pprot_packno[0] = 0; + parameters->jpwl_pprot[0] = pprot; + + } else if (sscanf(token, "p%d=%d", &tile, &pprot) == 2) { + /* method specified from that tile on */ + if (!((pprot == 0) || (pprot == 1) || (pprot == 16) || (pprot == 32) || + ((pprot >= 37) && (pprot <= 128)))) { + fprintf(stderr, "ERROR -> invalid packet protection method p = %d\n", pprot); + return 1; + } + if (tile < 0) { + fprintf(stderr, "ERROR -> invalid tile 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') { + + static int tile = 0, tilespec = 0, lasttileno = 0; + + addr = 0; /* predefined: auto */ + + if(sscanf(token, "a=%d", &addr) == 1) { + /* Specified */ + if ((addr != 0) && (addr != 2) && (addr != 4)) { + fprintf(stderr, "ERROR -> invalid addressing size a = %d\n", addr); + return 1; + } + parameters->jpwl_sens_addr = addr; + + } else if (!strcmp(token, "a")) { + /* default */ + parameters->jpwl_sens_addr = addr; /* auto for default size */ + + } else { + fprintf(stderr, "ERROR -> invalid addressing selection = %s\n", token); + return 1; + }; + + } + + /* search sensitivity size */ + if (*token == 'z') { + + static int tile = 0, tilespec = 0, lasttileno = 0; + + size = 1; /* predefined: 1 byte */ + + if(sscanf(token, "z=%d", &size) == 1) { + /* Specified */ + if ((size != 0) && (size != 1) && (size != 2)) { + fprintf(stderr, "ERROR -> invalid sensitivity size z = %d\n", size); + return 1; + } + parameters->jpwl_sens_size = size; + + } else if (!strcmp(token, "a")) { + /* default */ + parameters->jpwl_sens_size = size; /* 1 for default size */ + + } else { + fprintf(stderr, "ERROR -> invalid size selection = %s\n", token); + return 1; + }; + + } + + /* search range method */ + if (*token == 'g') { + + static int tile = 0, tilespec = 0, lasttileno = 0; + + range = 0; /* predefined: 0 (packet) */ + + if(sscanf(token, "g=%d", &range) == 1) { + /* Specified */ + if ((range < 0) || (range > 3)) { + fprintf(stderr, "ERROR -> invalid sensitivity range method g = %d\n", range); + return 1; + } + parameters->jpwl_sens_range = range; + + } else if (!strcmp(token, "g")) { + /* default */ + parameters->jpwl_sens_range = range; + + } else { + fprintf(stderr, "ERROR -> invalid range selection = %s\n", token); + return 1; + }; + + } + + /* next token or bust */ + token = strtok(NULL, ","); + }; + + + /* some info */ + fprintf(stdout, "Info: JPWL capabilities enabled\n"); + parameters->jpwl_epc_on = true; + + } + break; +#endif /* USE_JPWL */ +/* < Command line not valid\n"); + return 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 ((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; +} + + +/** Create the same index as j2k_create_index does, but in an int[] instead of in a file ==> easy to pass it back to Java, to transfer it etc. + @param buffer_size, increased by the length of the compressed index, in number of bytes + @return a pointer to a char[] + Syntax of the index: + one char for the version number (1): one byte because no problem with little endian, big endian etc. + one int for each of the following informations: + Image Width + Image Height + progression order + Tile width + Tile height + Nb tiles in X + Nb tiles in Y + Nb of components + Nb of layers + Nb of resolutions + + for each resolution: + Precinct width + Precinct height + + End main header position + codestream size + + For each tile: + tile number + tile start pos in codestream + tile header end position + tile end position in codestream + + For each LRCP, RLCP etc.: + packet number + tile number + layer number + resolution number + component number + precinct number + start position in the codestream + end position of this packet + */ +char* create_index_into_byte_array(opj_codestream_info_t *cstr_info, int* buffer_size) { + int tileno, compno, layno, resno, precno, pack_nb, x, y; + char* buffer = NULL; + int buffer_pos = 0; + int prec_max = 0; + + prec_max = 0; + for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) { + for (resno = 0; resno < cstr_info->numdecompos[0] + 1; resno++) { + prec_max = max(prec_max,cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno]); + } + } + + // Compute the size of the index buffer, in number of bytes*/ + *buffer_size = + 1 /* version */ + + (10 /* image_w until decomposition */ + + (cstr_info->numdecompos[0]+1) * 2 /* pdx size for each tile */ + + 2 /* main_head_end + codestream_size */ + + cstr_info->tw * cstr_info->th * 4 /* tile info, without distorsion info */ + + cstr_info->tw*cstr_info->th * cstr_info->numlayers * (cstr_info->numdecompos[0] + 1) * cstr_info->numcomps * prec_max *8 + ) * sizeof(int); + //printf("C: index buffer size = %d bytes\n", *buffer_size); + buffer = (char*) malloc(*buffer_size); + + if (!buffer) { + //opj_event_msg(j2k->cinfo, EVT_ERROR, "failed to allocate index buffer for writing %d int\n", *buffer_size); + fprintf(stderr, "failed to allocate index buffer for writing %d int\n", *buffer_size); + return 0; + } + + buffer[0] = 1; // Version stored on a byte + buffer++; + // Remaining informations are stored on a int. + ((int*)buffer)[buffer_pos++] = cstr_info->image_w; + ((int*)buffer)[buffer_pos++] = cstr_info->image_h; + ((int*)buffer)[buffer_pos++] = cstr_info->prog; + ((int*)buffer)[buffer_pos++] = cstr_info->tile_x; + ((int*)buffer)[buffer_pos++] = cstr_info->tile_y; + ((int*)buffer)[buffer_pos++] = cstr_info->tw; + ((int*)buffer)[buffer_pos++] = cstr_info->th; + ((int*)buffer)[buffer_pos++] = cstr_info->numcomps; + ((int*)buffer)[buffer_pos++] = cstr_info->numlayers; + ((int*)buffer)[buffer_pos++] = cstr_info->numdecompos[0]; + + for (resno = cstr_info->numdecompos[0]; resno >= 0; resno--) { + /* based on tile 0 */ + ((int*)buffer)[buffer_pos++] = (1 << cstr_info->tile[0].pdx[resno]); + ((int*)buffer)[buffer_pos++] = (1 << cstr_info->tile[0].pdx[resno]); + } + ((int*)buffer)[buffer_pos++] = cstr_info->main_head_end; + ((int*)buffer)[buffer_pos++] = cstr_info->codestream_size; + + for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) { + ((int*)buffer)[buffer_pos++] = cstr_info->tile[tileno].tileno; + ((int*)buffer)[buffer_pos++] = cstr_info->tile[tileno].start_pos; + ((int*)buffer)[buffer_pos++] = cstr_info->tile[tileno].end_header; + ((int*)buffer)[buffer_pos++] = cstr_info->tile[tileno].end_pos; + } + + for (tileno = 0; tileno < cstr_info->tw * cstr_info->th; tileno++) { + int start_pos, end_pos; + int max_numdecompos = 0; + pack_nb = 0; + + for (compno = 0; compno < cstr_info->numcomps; compno++) { + if (max_numdecompos < cstr_info->numdecompos[compno]) + max_numdecompos = cstr_info->numdecompos[compno]; + } + + if (cstr_info->prog == LRCP) { /* LRCP */ + + for (layno = 0; layno < cstr_info->numlayers; layno++) { + for (resno = 0; resno < max_numdecompos + 1; resno++) { + for (compno = 0; compno < cstr_info->numcomps; compno++) { + int prec_max; + if (resno > cstr_info->numdecompos[compno]) + break; + prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno]; + for (precno = 0; precno < prec_max; precno++) { + start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos; + end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos; + ((int*)buffer)[buffer_pos++] = pack_nb; + ((int*)buffer)[buffer_pos++] = tileno; + ((int*)buffer)[buffer_pos++] = layno; + ((int*)buffer)[buffer_pos++] = resno; + ((int*)buffer)[buffer_pos++] = compno; + ((int*)buffer)[buffer_pos++] = precno; + ((int*)buffer)[buffer_pos++] = start_pos; + ((int*)buffer)[buffer_pos++] = end_pos; + pack_nb++; + } + } + } + } + } /* LRCP */ + else if (cstr_info->prog == RLCP) { /* RLCP */ + + for (resno = 0; resno < max_numdecompos + 1; resno++) { + for (layno = 0; layno < cstr_info->numlayers; layno++) { + for (compno = 0; compno < cstr_info->numcomps; compno++) { + int prec_max; + if (resno > cstr_info->numdecompos[compno]) + break; + prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno]; + for (precno = 0; precno < prec_max; precno++) { + start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos; + end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos; + ((int*)buffer)[buffer_pos++] = pack_nb; + ((int*)buffer)[buffer_pos++] = tileno; + ((int*)buffer)[buffer_pos++] = resno; + ((int*)buffer)[buffer_pos++] = layno; + ((int*)buffer)[buffer_pos++] = compno; + ((int*)buffer)[buffer_pos++] = precno; + ((int*)buffer)[buffer_pos++] = start_pos; + ((int*)buffer)[buffer_pos++] = end_pos; + pack_nb++; + } + } + } + } + } /* RLCP */ + else if (cstr_info->prog == RPCL) { /* RPCL */ + + for (resno = 0; resno < max_numdecompos + 1; resno++) { + /* I suppose components have same XRsiz, YRsiz */ + int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x; + int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y; + int x1 = x0 + cstr_info->tile_x; + int y1 = y0 + cstr_info->tile_y; + for (compno = 0; compno < cstr_info->numcomps; compno++) { + int prec_max; + if (resno > cstr_info->numdecompos[compno]) + break; + prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno]; + for (precno = 0; precno < prec_max; precno++) { + int pcnx = cstr_info->tile[tileno].pw[resno]; + int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno ); + int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno ); + int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx; + int precno_y = (int) floor( (float)precno/(float)pcnx ); + for(y = y0; y < y1; y++) { + if (precno_y*pcy == y ) { + for (x = x0; x < x1; x++) { + if (precno_x*pcx == x ) { + for (layno = 0; layno < cstr_info->numlayers; layno++) { + start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos; + end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos; + ((int*)buffer)[buffer_pos++] = pack_nb; + ((int*)buffer)[buffer_pos++] = tileno; + ((int*)buffer)[buffer_pos++] = resno; + ((int*)buffer)[buffer_pos++] = precno; + ((int*)buffer)[buffer_pos++] = compno; + ((int*)buffer)[buffer_pos++] = layno; + ((int*)buffer)[buffer_pos++] = start_pos; + ((int*)buffer)[buffer_pos++] = end_pos; + pack_nb++; + } + } + }/* x = x0..x1 */ + } + } /* y = y0..y1 */ + } /* precno */ + } /* compno */ + } /* resno */ + } /* RPCL */ + else if (cstr_info->prog == PCRL) { /* PCRL */ + /* I suppose components have same XRsiz, YRsiz */ + int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x; + int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y; + int x1 = x0 + cstr_info->tile_x; + int y1 = y0 + cstr_info->tile_y; + + for (compno = 0; compno < cstr_info->numcomps; compno++) { + for (resno = 0; resno < max_numdecompos + 1; resno++) { + int prec_max; + if (resno > cstr_info->numdecompos[compno]) + break; + prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno]; + for (precno = 0; precno < prec_max; precno++) { + int pcnx = cstr_info->tile[tileno].pw[resno]; + int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno ); + int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno ); + int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx; + int precno_y = (int) floor( (float)precno/(float)pcnx ); + for(y = y0; y < y1; y++) { + if (precno_y*pcy == y ) { + for (x = x0; x < x1; x++) { + if (precno_x*pcx == x ) { + for (layno = 0; layno < cstr_info->numlayers; layno++) { + start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos; + end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos; + ((int*)buffer)[buffer_pos++] = pack_nb; + ((int*)buffer)[buffer_pos++] = tileno; + ((int*)buffer)[buffer_pos++] = precno; + ((int*)buffer)[buffer_pos++] = compno; + ((int*)buffer)[buffer_pos++] = resno; + ((int*)buffer)[buffer_pos++] = layno; + ((int*)buffer)[buffer_pos++] = start_pos; + ((int*)buffer)[buffer_pos++] = end_pos; + pack_nb++; + } + } + }/* x = x0..x1 */ + } + } /* y = y0..y1 */ + } /* precno */ + } /* resno */ + } /* compno */ + } /* PCRL */ + else { /* CPRL */ + + for (compno = 0; compno < cstr_info->numcomps; compno++) { + /* I suppose components have same XRsiz, YRsiz */ + int x0 = cstr_info->tile_Ox + tileno - (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tw * cstr_info->tile_x; + int y0 = cstr_info->tile_Ox + (int)floor( (float)tileno/(float)cstr_info->tw ) * cstr_info->tile_y; + int x1 = x0 + cstr_info->tile_x; + int y1 = y0 + cstr_info->tile_y; + + for (resno = 0; resno < max_numdecompos + 1; resno++) { + int prec_max; + if (resno > cstr_info->numdecompos[compno]) + break; + prec_max = cstr_info->tile[tileno].pw[resno] * cstr_info->tile[tileno].ph[resno]; + for (precno = 0; precno < prec_max; precno++) { + int pcnx = cstr_info->tile[tileno].pw[resno]; + int pcx = (int) pow( 2, cstr_info->tile[tileno].pdx[resno] + cstr_info->numdecompos[compno] - resno ); + int pcy = (int) pow( 2, cstr_info->tile[tileno].pdy[resno] + cstr_info->numdecompos[compno] - resno ); + int precno_x = precno - (int) floor( (float)precno/(float)pcnx ) * pcnx; + int precno_y = (int) floor( (float)precno/(float)pcnx ); + for(y = y0; y < y1; y++) { + if (precno_y*pcy == y ) { + for (x = x0; x < x1; x++) { + if (precno_x*pcx == x ) { + for (layno = 0; layno < cstr_info->numlayers; layno++) { + start_pos = cstr_info->tile[tileno].packet[pack_nb].start_pos; + end_pos = cstr_info->tile[tileno].packet[pack_nb].end_pos; + ((int*)buffer)[buffer_pos++] = pack_nb; + ((int*)buffer)[buffer_pos++] = tileno; + ((int*)buffer)[buffer_pos++] = compno; + ((int*)buffer)[buffer_pos++] = precno; + ((int*)buffer)[buffer_pos++] = resno; + ((int*)buffer)[buffer_pos++] = layno; + ((int*)buffer)[buffer_pos++] = start_pos; + ((int*)buffer)[buffer_pos++] = end_pos; + pack_nb++; + } + } + }/* x = x0..x1 */ + } + } /* y = y0..y1 */ + } /* precno */ + } /* resno */ + } /* compno */ + } /* CPRL */ + } /* tileno */ + + if (buffer_pos > *buffer_size) { + //opj_event_msg(j2k->cinfo, EVT_ERROR, "index creation: buffer_pos (%d) > buffer_size (%d)!\n", buffer_pos, *buffer_size); + fprintf(stderr, "index creation: buffer_pos (%d) > buffer_size (%d)!\n", buffer_pos, *buffer_size); + return 0; + } + + return --buffer; +} + + + + +/* -------------------------------------------------------------------------- + ------------ Get the image byte[] from the Java object -------------------*/ + +opj_image_t* loadImage(opj_cparameters_t *parameters, JNIEnv *env, jobject obj, jclass cls) { + int i,max,shift,w,h,depth; + opj_image_t * img = NULL; + int compno, numcomps; + opj_image_t * image = NULL; + opj_image_comp_t *comp; + opj_image_cmptparm_t cmptparm[3]; /* maximum of 3 components */ + OPJ_COLOR_SPACE color_space; + jfieldID fid; + jint ji; + jbyteArray jba; + jshortArray jsa; + jintArray jia; + int len; + jbyte *jbBody; + jshort *jsBody; + jint *jiBody; + boolean isCopy; + + // Image width, height and depth + fid = (*env)->GetFieldID(env, cls,"width", "I"); + ji = (*env)->GetIntField(env, obj, fid); + w = ji; + + fid = (*env)->GetFieldID(env, cls,"height", "I"); + ji = (*env)->GetIntField(env, obj, fid); + h = ji; + + fid = (*env)->GetFieldID(env, cls,"depth", "I"); + ji = (*env)->GetIntField(env, obj, fid); + depth = ji; + + // Read the image + if (depth <=16) { + numcomps = 1; + color_space = CLRSPC_GRAY; + } else { + numcomps = 3; + color_space = CLRSPC_SRGB; + } + memset(&cmptparm[0], 0, numcomps * sizeof(opj_image_cmptparm_t)); + + if (numcomps == 1) { + cmptparm[0].x0 = parameters->image_offset_x0; + cmptparm[0].y0 = parameters->image_offset_y0; + cmptparm[0].w = !cmptparm[0].x0 ? (w - 1) * parameters->subsampling_dx + 1 : cmptparm[0].x0 + (w - 1) * parameters->subsampling_dx + 1; + cmptparm[0].h = !cmptparm[0].y0 ? (h - 1) * parameters->subsampling_dy + 1 : cmptparm[0].y0 + (h - 1) * parameters->subsampling_dy + 1; + // Java types are always signed but we use them as unsigned types (shift of the negative part of + // the pixels of the images in Telemis before entering the encoder). + cmptparm[0].sgnd = 0; + if (depth<=16) + cmptparm[0].prec=depth; + else + cmptparm[0].prec = 8; + cmptparm[0].bpp = cmptparm[0].prec; + cmptparm[0].dx = parameters->subsampling_dx; + cmptparm[0].dy = parameters->subsampling_dy; + /*printf("C: component 0 initialised: x0=%d, y0=%d, w=%d, h=%d, sgnd=%d, bpp=%d, dx=%d, dy=%d, color_space=%d\n", cmptparm[0].x0, cmptparm[0].y0, cmptparm[0].w, + cmptparm[0].h, cmptparm[0].sgnd, cmptparm[0].bpp, cmptparm[0].dx, cmptparm[0].dy, color_space);*/ + } else { + for(i = 0; i < numcomps; i++) { + cmptparm[i].prec = 8; + cmptparm[i].bpp = 8; + cmptparm[i].sgnd = 0; + cmptparm[i].dx = parameters->subsampling_dx; + cmptparm[i].dy = parameters->subsampling_dy; + cmptparm[i].w = w; + cmptparm[i].h = h; + } + } + + /* create the image */ + image = opj_image_create(numcomps, &cmptparm[0], color_space); + + if (!image) + return NULL; + + if (depth <=16) { + image->numcomps=1; + } else { + image->numcomps = 3; + } + + /* set image offset and reference grid */ + image->x0 = cmptparm[0].x0; + image->y0 = cmptparm[0].x0; + image->x1 = cmptparm[0].w; + image->y1 = cmptparm[0].h; + + /* set image data */ + for (compno=0; compnocomps[compno]; + max = -100000; + if (depth == 8) { + fid = (*env)->GetFieldID(env, cls,"image8", "[B"); // byteArray [] + jba = (*env)->GetObjectField(env, obj, fid); + len = (*env)->GetArrayLength(env, jba); + + jbBody = (*env)->GetPrimitiveArrayCritical(env, jba, &isCopy); + //printf("C: before transfering 8 bpp image\n"); + if (comp->sgnd) { + for(i=0; i< len;i++) { + comp->data[i] = (char) jbBody[i]; + if (comp->data[i] > max) max = comp->data[i]; + } + } else { + for(i=0; i< len;i++) { + comp->data[i] = (unsigned char) jbBody[i]; + if (comp->data[i] > max) max = comp->data[i]; + } + } + (*env)->ReleasePrimitiveArrayCritical(env, jba, jbBody, 0); + } else if(depth == 16) { + fid = (*env)->GetFieldID(env, cls,"image16", "[S"); // shortArray [] + jsa = (*env)->GetObjectField(env, obj, fid); + len = (*env)->GetArrayLength(env, jsa); + + jsBody = (*env)->GetPrimitiveArrayCritical(env, jsa, &isCopy); + //printf("C: before transfering 16 bpp image\n"); + if (comp->sgnd) { // Special behaviour to deal with signed elements ?? + comp->data[i] = (short) jsBody[i]; + for(i=0; i< len;i++) { + if (comp->data[i] > max) max = comp->data[i]; + } + } else { + for(i=0; i< len;i++) { + comp->data[i] = (unsigned short) jsBody[i]; + if (comp->data[i] > max) max = comp->data[i]; + } + } + (*env)->ReleasePrimitiveArrayCritical(env, jsa, jsBody, 0); + } else if (depth == 24) { + fid = (*env)->GetFieldID(env, cls,"image24", "[I"); // intArray [] + jia = (*env)->GetObjectField(env, obj, fid); + len = (*env)->GetArrayLength(env, jia); + shift = compno*8; + + jiBody = (*env)->GetPrimitiveArrayCritical(env, jia, &isCopy); + //printf("C: before transfering 24 bpp image (component %d, signed = %d)\n", compno, comp->sgnd); + if (comp->sgnd) { // Special behaviour to deal with signed elements ?? XXXXX + for(i=0; i< len;i++) { + comp->data[i] = ( ((int) jiBody[i]) & (0xFF << shift) ) >> shift; + if (comp->data[i] > max) max = comp->data[i]; + } + } else { + for(i=0; i< len;i++) { + comp->data[i] = ( ((unsigned int) jiBody[i]) & (0xFF << shift) ) >> shift; + if (comp->data[i] > max) max = comp->data[i]; + } + } + (*env)->ReleasePrimitiveArrayCritical(env, jia, jiBody, 0); + } + comp->bpp = int_floorlog2(max)+1; + comp->prec = comp->bpp; + //printf("C: component %d: max %d, real bpp = %d\n", compno, max, comp->bpp); + } + return image; +} + + +/* -------------------------------------------------------------------------- + -------------------- MAIN METHOD, CALLED BY JAVA -----------------------*/ +JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImageToJ2K(JNIEnv *env, jobject obj, jobjectArray javaParameters) { + int argc; /* To simulate the command line parameters (taken from the javaParameters variable) and be able to re-use the */ + char **argv; /* 'parse_cmdline_decoder' method taken from the j2k_to_image project */ + bool bSuccess; + opj_cparameters_t parameters; /* compression parameters */ + img_fol_t img_fol; + opj_event_mgr_t event_mgr; /* event manager */ + opj_image_t *image = NULL; + int i,j,num_images; + int imageno; + opj_codestream_info_t cstr_info; /* Codestream information structure */ + char indexfilename[OPJ_PATH_LEN]; /* index file name */ + + int* compressed_index = NULL; + int compressed_index_size=-1; + // ==> Access variables to the Java member variables + jsize arraySize; + jclass cls; + jobject object; + jboolean isCopy; + jfieldID fid; + jbyteArray jba; + jbyte *jbBody; + callback_variables_t msgErrorCallback_vars; + // <== access variable to the Java member variables. + + // For the encoding and storage into the file + opj_cinfo_t* cinfo; + int codestream_length; + opj_cio_t *cio = NULL; + FILE *f = NULL; + + // JNI reference to the calling class + cls = (*env)->GetObjectClass(env, obj); + + // Pointers to be able to call a Java method for all the info and error messages + msgErrorCallback_vars.env = env; + msgErrorCallback_vars.jobj = &obj; + msgErrorCallback_vars.message_mid = (*env)->GetMethodID(env, cls, "logMessage", "(Ljava/lang/String;)V"); + msgErrorCallback_vars.error_mid = (*env)->GetMethodID(env, cls, "logError", "(Ljava/lang/String;)V"); + + arraySize = (*env)->GetArrayLength(env, javaParameters); + argc = (int) arraySize +1; + argv = malloc(argc*sizeof(char*)); + argv[0] = "ProgramName.exe"; // The program name: useless + j=0; + for (i=1; iGetObjectArrayElement(env, javaParameters, i-1); + argv[i] = (*env)->GetStringUTFChars(env, object, &isCopy); + } + + /*printf("C: "); + for (i=0; iReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]); + return -1; + } + + // Release the Java arguments array + for (i=1; iReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]); + + if (parameters.cp_cinema){ + cinema_parameters(¶meters); + } + + + /* Create comment for codestream */ + if(parameters.cp_comment == NULL) { + const char comment[] = "Created by JavaOpenJPEG 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 +/* <numcomps == 3 ? 1 : 0; + + if(parameters.cp_cinema){ + cinema_setup_encoder(¶meters,image,&img_fol); + } + + /* encode the destination image */ + /* ---------------------------- */ + /* get a J2K compressor handle */ + if (parameters.cod_format == J2K_CFMT) { /* J2K format output */ + cinfo = opj_create_compress(CODEC_J2K); + } else { /* JP2 format output */ + cinfo = opj_create_compress(CODEC_JP2); + } + /* catch events using our callbacks and give a local context */ + opj_set_event_mgr((opj_common_ptr)cinfo, &event_mgr, &msgErrorCallback_vars); + + /* setup the encoder parameters using the current image and user parameters */ + opj_setup_encoder(cinfo, ¶meters, image); + + /* open a byte stream for writing */ + /* allocate memory for all tiles */ + cio = opj_cio_open((opj_common_ptr)cinfo, NULL, 0); + + /* encode the image */ + bSuccess = opj_encode_with_info(cinfo, cio, image, &cstr_info); + printf("C: after opj_encode_with_info\n"); + if (!bSuccess) { + opj_cio_close(cio); + fprintf(stderr, "failed to encode image\n"); + return -1; + } + codestream_length = cio_tell(cio); + + /* write the index on disk, if needed (-x 'filename') */ + if (*indexfilename) { + bSuccess = write_index_file(&cstr_info, indexfilename); + if (bSuccess) { + fprintf(stderr, "Failed to output index file into [%s]\n", indexfilename); + } + } + + compressed_index = create_index_into_byte_array(&cstr_info, &compressed_index_size); + /* Allocates the Java compressedIndex byte[] and sends this index into the Java object */ + fid = (*env)->GetFieldID(env, cls,"compressedIndex", "[B"); + jba = (*env)->NewByteArray(env, compressed_index_size+1); + jbBody = (*env)->GetPrimitiveArrayCritical(env, jba, 0); + memcpy(jbBody, compressed_index, compressed_index_size); + (*env)->ReleasePrimitiveArrayCritical(env, jba, jbBody, 0); + (*env)->SetObjectField(env, obj, fid, jba); + free(compressed_index); + + /* write the generated codestream to disk ? */ + if (parameters.outfile[0]!='\0') { + f = fopen(parameters.outfile, "wb"); + if (!f) { + fprintf(stderr, "failed to open [%s] for writing\n", parameters.outfile); + return -1; + } + fwrite(cio->buffer, 1, codestream_length, f); + fclose(f); + fprintf(stdout,"Generated outfile [%s]\n",parameters.outfile); + } + + /* Write the generated codestream to the Java pre-allocated compressedStream byte[] */ + fid = (*env)->GetFieldID(env, cls,"compressedStream", "[B"); + jba = (*env)->GetObjectField(env, obj, fid); + jbBody = (*env)->GetPrimitiveArrayCritical(env, jba, 0); + memcpy(jbBody, cio->buffer, codestream_length); + (*env)->ReleasePrimitiveArrayCritical(env, jba, jbBody, 0); + + /* close and free the byte stream */ + opj_cio_close(cio); + + /* free remaining compression structures */ + opj_destroy_compress(cinfo); + opj_destroy_cstr_info(&cstr_info); + + /* 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); + + return codestream_length; +} diff --git a/JavaOpenJPEG/JavaOpenJPEG.dsp b/JavaOpenJPEG/JavaOpenJPEG.dsp new file mode 100644 index 00000000..389ef7a2 --- /dev/null +++ b/JavaOpenJPEG/JavaOpenJPEG.dsp @@ -0,0 +1,110 @@ +# Microsoft Developer Studio Project File - Name="image_to_j2k" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=image_to_j2k - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "image_to_j2k.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "image_to_j2k.mak" CFG="image_to_j2k - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "image_to_j2k - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "image_to_j2k - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "image_to_j2k - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x40c /d "NDEBUG" +# ADD RSC /l 0x40c /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libs/libtiff/libtiff.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc" +# SUBTRACT LINK32 /pdb:none + +!ELSEIF "$(CFG)" == "image_to_j2k - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x40c /d "_DEBUG" +# ADD RSC /l 0x40c /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libs/libtiff/libtiff.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libc" /pdbtype:sept +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "image_to_j2k - Win32 Release" +# Name "image_to_j2k - Win32 Debug" +# Begin Source File + +SOURCE=.\convert.c +# End Source File +# Begin Source File + +SOURCE=.\convert.h +# End Source File +# Begin Source File + +SOURCE=.\compat\getopt.c +# End Source File +# Begin Source File + +SOURCE=.\compat\getopt.h +# End Source File +# Begin Source File + +SOURCE=.\image_to_j2k.c +# End Source File +# End Target +# End Project diff --git a/JavaOpenJPEG/JavaOpenJPEG.dsw b/JavaOpenJPEG/JavaOpenJPEG.dsw new file mode 100644 index 00000000..fd19c260 --- /dev/null +++ b/JavaOpenJPEG/JavaOpenJPEG.dsw @@ -0,0 +1,44 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "LibOpenJPEG"=..\LibOpenJPEG.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "image_to_j2k"=.\image_to_j2k.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name LibOpenJPEG + End Project Dependency +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/JavaOpenJPEG/JavaOpenJPEG.vcproj b/JavaOpenJPEG/JavaOpenJPEG.vcproj new file mode 100644 index 00000000..6d3c5974 --- /dev/null +++ b/JavaOpenJPEG/JavaOpenJPEG.vcproj @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/JavaOpenJPEG/JavaOpenJPEGDecoder.c b/JavaOpenJPEG/JavaOpenJPEGDecoder.c new file mode 100644 index 00000000..a33fe9db --- /dev/null +++ b/JavaOpenJPEG/JavaOpenJPEGDecoder.c @@ -0,0 +1,897 @@ +/* + * 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) 2007, Patrick Piscaglia (Telemis) + * 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 + +#include "openjpeg.h" +#include "compat/getopt.h" +#include "convert.h" +#include "dirent.h" +#include "org_openJpeg_OpenJPEGJavaDecoder.h" + +#ifndef WIN32 +#define stricmp strcasecmp +#define strnicmp strncasecmp +#endif + +/* ----------------------------------------------------------------------- */ + +#define J2K_CFMT 0 +#define JP2_CFMT 1 +#define JPT_CFMT 2 + +#define PXM_DFMT 10 +#define PGX_DFMT 11 +#define BMP_DFMT 12 +#define YUV_DFMT 13 +#define TIF_DFMT 14 +#define RAW_DFMT 15 +#define TGA_DFMT 16 + +/* ----------------------------------------------------------------------- */ + +typedef struct callback_variables { + JNIEnv *env; + /** 'jclass' object used to call a Java method from the C */ + jobject *jobj; + /** 'jclass' object used to call a Java method from the C */ + jmethodID message_mid; + jmethodID error_mid; +} callback_variables_t; + +typedef struct dircnt{ + /** Buffer for holding images read from Directory*/ + char *filename_buf; + /** Pointer to the buffer*/ + char **filename; +}dircnt_t; + + +typedef struct img_folder{ + /** The directory path of the folder containing input images*/ + char *imgdirpath; + /** Output format*/ + char *out_format; + /** Enable option*/ + char set_imgdir; + /** Enable Cod Format for output*/ + char set_out_format; + +}img_fol_t; + + +void decode_help_display() { + fprintf(stdout,"HELP\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 */ + "decoder:\n"); +/* < \n"); + fprintf(stdout," Currently accepts PGM, PPM, PNM, PGX, BMP format\n"); + fprintf(stdout," -i \n"); + fprintf(stdout," REQUIRED only if an Input image directory not specified\n"); + fprintf(stdout," Currently accepts J2K-files, JP2-files and JPT-files. The file type\n"); + fprintf(stdout," is identified based on its suffix.\n"); + fprintf(stdout," -o \n"); + fprintf(stdout," REQUIRED\n"); + fprintf(stdout," Currently accepts PGM-files, PPM-files, PNM-files, PGX-files and\n"); + fprintf(stdout," BMP-files. Binary data is written to the file (not ascii). If a PGX\n"); + fprintf(stdout," filename is given, there will be as many output files as there are\n"); + fprintf(stdout," components: an indice starting from 0 will then be appended to the\n"); + fprintf(stdout," output filename, just before the \"pgx\" extension. If a PGM filename\n"); + fprintf(stdout," is given and there are more than one component, only the first component\n"); + fprintf(stdout," will be written to the file.\n"); + fprintf(stdout," -r \n"); + fprintf(stdout," Set the number of highest resolution levels to be discarded. The\n"); + fprintf(stdout," image resolution is effectively divided by 2 to the power of the\n"); + fprintf(stdout," number of discarded levels. The reduce factor is limited by the\n"); + fprintf(stdout," smallest total number of decomposition levels among tiles.\n"); + fprintf(stdout," -l \n"); + fprintf(stdout," Set the maximum number of quality layers to decode. If there are\n"); + fprintf(stdout," less quality layers than the specified number, all the quality layers\n"); + fprintf(stdout," are decoded.\n"); +/* UniPG>> */ +#ifdef USE_JPWL + fprintf(stdout," -W \n"); + fprintf(stdout," Activates the JPWL correction capability, if the codestream complies.\n"); + fprintf(stdout," Options can be a comma separated list of tokens:\n"); + fprintf(stdout," c, c=numcomps\n"); + fprintf(stdout," numcomps is the number of expected components in the codestream\n"); + fprintf(stdout," (search of first EPB rely upon this, default is %d)\n", JPWL_EXPECTED_COMPONENTS); +#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", "bmp","tif", "raw", "tga", "j2k", "jp2", "jpt", "j2c" }; + static const int format[] = { PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, TGA_DFMT, J2K_CFMT, JP2_CFMT, JPT_CFMT, J2K_CFMT }; + char * ext = strrchr(filename, '.'); + if (ext == NULL) + return -1; + ext++; + if(ext) { + for(i = 0; i < sizeof(format)/sizeof(*format); i++) { + if(strnicmp(ext, extension[i], 3) == 0) { + return format[i]; + } + } + } + + return -1; +} + + +/* -------------------------------------------------------------------------- */ + +int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters,img_fol_t *img_fol) { + /* parse the command line */ + int totlen; + option_t long_option[]={ + {"ImgDir",REQ_ARG, NULL ,'y'}, + {"OutFor",REQ_ARG, NULL ,'O'}, + }; + +/* UniPG>> */ + const char optlist[] = "i:o:r:l:hx:" + +#ifdef USE_JPWL + "W:" +#endif /* USE_JPWL */ + ; + /*for (i=0; iset_out_format = 0; + reset_options_reading(); + + while (1) { + int c = getopt_long(argc, argv,optlist,long_option,totlen); + if (c == -1) + break; + switch (c) { + case 'i': /* input file */ + { + char *infile = optarg; + parameters->decod_format = get_file_format(infile); + switch(parameters->decod_format) { + case J2K_CFMT: + case JP2_CFMT: + case JPT_CFMT: + break; + default: + fprintf(stderr, + "!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", + infile); + return 1; + } + strncpy(parameters->infile, infile, sizeof(parameters->infile)-1); + } + break; + + /* ----------------------------------------------------- */ + + case 'o': /* output file */ + { + char *outfile = optarg; + parameters->cod_format = get_file_format(outfile); + switch(parameters->cod_format) { + case PGX_DFMT: + case PXM_DFMT: + case BMP_DFMT: + case TIF_DFMT: + case RAW_DFMT: + case TGA_DFMT: + break; + default: + fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outfile); + return 1; + } + strncpy(parameters->outfile, outfile, sizeof(parameters->outfile)-1); + } + break; + + /* ----------------------------------------------------- */ + + case 'O': /* output format */ + { + char outformat[50]; + char *of = optarg; + sprintf(outformat,".%s",of); + img_fol->set_out_format = 1; + parameters->cod_format = get_file_format(outformat); + switch(parameters->cod_format) { + case PGX_DFMT: + img_fol->out_format = "pgx"; + break; + case PXM_DFMT: + img_fol->out_format = "ppm"; + break; + case BMP_DFMT: + img_fol->out_format = "bmp"; + break; + case TIF_DFMT: + img_fol->out_format = "tif"; + break; + case RAW_DFMT: + img_fol->out_format = "raw"; + break; + case TGA_DFMT: + img_fol->out_format = "raw"; + break; + default: + fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx, *.bmp, *.tif, *.raw or *.tga]!! \n", outformat); + return 1; + break; + } + } + break; + + /* ----------------------------------------------------- */ + + + case 'r': /* reduce option */ + { + sscanf(optarg, "%d", ¶meters->cp_reduce); + } + break; + + /* ----------------------------------------------------- */ + + + case 'l': /* layering option */ + { + sscanf(optarg, "%d", ¶meters->cp_layer); + } + break; + + /* ----------------------------------------------------- */ + + case 'h': /* display an help description */ + decode_help_display(); + return 1; + + /* ------------------------------------------------------ */ + + case 'y': /* Image Directory path */ + { + img_fol->imgdirpath = (char*)malloc(strlen(optarg) + 1); + strcpy(img_fol->imgdirpath,optarg); + img_fol->set_imgdir=1; + } + break; + /* ----------------------------------------------------- */ +/* UniPG>> */ +#ifdef USE_JPWL + + case 'W': /* activate JPWL correction */ + { + char *token = NULL; + + token = strtok(optarg, ","); + while(token != NULL) { + + /* search expected number of components */ + if (*token == 'c') { + + static int compno; + + compno = JPWL_EXPECTED_COMPONENTS; /* predefined no. of components */ + + if(sscanf(token, "c=%d", &compno) == 1) { + /* Specified */ + if ((compno < 1) || (compno > 256)) { + fprintf(stderr, "ERROR -> invalid number of components c = %d\n", compno); + return 1; + } + parameters->jpwl_exp_comps = compno; + + } else if (!strcmp(token, "c")) { + /* default */ + parameters->jpwl_exp_comps = compno; /* auto for default size */ + + } else { + fprintf(stderr, "ERROR -> invalid components specified = %s\n", token); + return 1; + }; + } + + /* search maximum number of tiles */ + if (*token == 't') { + + static int tileno; + + tileno = JPWL_MAXIMUM_TILES; /* maximum no. of tiles */ + + if(sscanf(token, "t=%d", &tileno) == 1) { + /* Specified */ + if ((tileno < 1) || (tileno > JPWL_MAXIMUM_TILES)) { + fprintf(stderr, "ERROR -> invalid number of tiles t = %d\n", tileno); + return 1; + } + parameters->jpwl_max_tiles = tileno; + + } else if (!strcmp(token, "t")) { + /* default */ + parameters->jpwl_max_tiles = tileno; /* auto for default size */ + + } else { + fprintf(stderr, "ERROR -> invalid tiles specified = %s\n", token); + return 1; + }; + } + + /* next token or bust */ + token = strtok(NULL, ","); + }; + parameters->jpwl_correct = true; + fprintf(stdout, "JPWL correction capability activated\n"); + fprintf(stdout, "- expecting %d components\n", parameters->jpwl_exp_comps); + } + break; +#endif /* USE_JPWL */ +/* < this option is not valid \"-%c %s\"\n",c, optarg); + break; + } + } + + /* No check for possible errors before the -i and -o options are of course not mandatory*/ + + return 0; +} + +/* -------------------------------------------------------------------------- */ + +/** +error callback returning the message to Java andexpecting a callback_variables_t client object +*/ +void error_callback(const char *msg, void *client_data) { + callback_variables_t* vars = (callback_variables_t*) client_data; + JNIEnv *env = vars->env; + jstring jbuffer; + + jbuffer = (*env)->NewStringUTF(env, msg); + (*env)->ExceptionClear(env); + (*env)->CallVoidMethod(env, *(vars->jobj), vars->error_mid, jbuffer); + + if ((*env)->ExceptionOccurred(env)) { + fprintf(stderr,"C: Exception during call back method\n"); + (*env)->ExceptionDescribe(env); + (*env)->ExceptionClear(env); + } + (*env)->DeleteLocalRef(env, jbuffer); +} +/** +warning callback returning the message to Java andexpecting a callback_variables_t client object +*/ +void warning_callback(const char *msg, void *client_data) { + callback_variables_t* vars = (callback_variables_t*) client_data; + JNIEnv *env = vars->env; + jstring jbuffer; + + jbuffer = (*env)->NewStringUTF(env, msg); + (*env)->ExceptionClear(env); + (*env)->CallVoidMethod(env, *(vars->jobj), vars->message_mid, jbuffer); + + if ((*env)->ExceptionOccurred(env)) { + fprintf(stderr,"C: Exception during call back method\n"); + (*env)->ExceptionDescribe(env); + (*env)->ExceptionClear(env); + } + (*env)->DeleteLocalRef(env, jbuffer); +} +/** +information callback returning the message to Java andexpecting a callback_variables_t client object +*/ +void info_callback(const char *msg, void *client_data) { + callback_variables_t* vars = (callback_variables_t*) client_data; + JNIEnv *env = vars->env; + jstring jbuffer; + + jbuffer = (*env)->NewStringUTF(env, msg); + (*env)->ExceptionClear(env); + (*env)->CallVoidMethod(env, *(vars->jobj), vars->message_mid, jbuffer); + + if ((*env)->ExceptionOccurred(env)) { + fprintf(stderr,"C: Exception during call back method\n"); + (*env)->ExceptionDescribe(env); + (*env)->ExceptionClear(env); + } + (*env)->DeleteLocalRef(env, jbuffer); +} + + +/* -------------------------------------------------------------------------- + -------------------- MAIN METHOD, CALLED BY JAVA -----------------------*/ +JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2KtoImage(JNIEnv *env, jobject obj, jobjectArray javaParameters) { + int argc; /* To simulate the command line parameters (taken from the javaParameters variable) and be able to re-use the */ + char **argv; /* 'parse_cmdline_decoder' method taken from the j2k_to_image project */ + opj_dparameters_t parameters; /* decompression parameters */ + img_fol_t img_fol; + opj_event_mgr_t event_mgr; /* event manager */ + opj_image_t *image = NULL; + FILE *fsrc = NULL; + unsigned char *src = NULL; + int file_length; + int num_images; + int i,j,imageno; + opj_dinfo_t* dinfo = NULL; /* handle to a decompressor */ + opj_cio_t *cio = NULL; + int w,h; + long min_value, max_value; + short tempS; unsigned char tempUC, tempUC1, tempUC2; + // ==> Access variables to the Java member variables + jsize arraySize; + jclass cls; + jobject object; + jboolean isCopy; + jfieldID fid; + jbyteArray jba; + jshortArray jsa; + jintArray jia; + jbyte *jbBody, *ptrBBody; + jshort *jsBody, *ptrSBody; + jint *jiBody, *ptrIBody; + callback_variables_t msgErrorCallback_vars; + // <=== access variable to Java member variables */ + int *ptr, *ptr1, *ptr2; // <== To transfer the decoded image to Java + + /* configure the event callbacks */ + memset(&event_mgr, 0, sizeof(opj_event_mgr_t)); + event_mgr.error_handler = error_callback; + event_mgr.warning_handler = warning_callback; + event_mgr.info_handler = info_callback; + + // JNI reference to the calling class + cls = (*env)->GetObjectClass(env, obj); + + // Pointers to be able to call a Java method for all the info and error messages + msgErrorCallback_vars.env = env; + msgErrorCallback_vars.jobj = &obj; + msgErrorCallback_vars.message_mid = (*env)->GetMethodID(env, cls, "logMessage", "(Ljava/lang/String;)V"); + msgErrorCallback_vars.error_mid = (*env)->GetMethodID(env, cls, "logError", "(Ljava/lang/String;)V"); + + // Get the String[] containing the parameters, and converts it into a char** to simulate command line arguments. + arraySize = (*env)->GetArrayLength(env, javaParameters); + argc = (int) arraySize +1; + argv = malloc(argc*sizeof(char*)); + argv[0] = "ProgramName.exe"; // The program name: useless + j=0; + for (i=1; iGetObjectArrayElement(env, javaParameters, i-1); + argv[i] = (*env)->GetStringUTFChars(env, object, &isCopy); + } + + /*printf("C: decoder params = "); + for (i=0; iReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]); + return -1; + } + // Release the Java arguments array + for (i=1; iReleaseStringUTFChars(env, (*env)->GetObjectArrayElement(env, javaParameters, i-1), argv[i]); + + num_images=1; + + // Get additional information from the Java object variables + fid = (*env)->GetFieldID(env, cls,"skippedResolutions", "I"); + parameters.cp_reduce = (short) (*env)->GetIntField(env, obj, fid); + + /*Decoding image one by one*/ + for(imageno = 0; imageno < num_images ; imageno++) + { + image = NULL; + fprintf(stderr,"\n"); + + /* read the input file and put it in memory into the 'src' object, if the -i option is given in JavaParameters. + Implemented for debug purpose. */ + /* -------------------------------------------------------------- */ + if (parameters.infile && parameters.infile[0]!='\0') { + //printf("C: opening [%s]\n", parameters.infile); + fsrc = fopen(parameters.infile, "rb"); + if (!fsrc) { + fprintf(stderr, "ERROR -> failed to open %s for reading\n", parameters.infile); + return 1; + } + fseek(fsrc, 0, SEEK_END); + file_length = ftell(fsrc); + fseek(fsrc, 0, SEEK_SET); + src = (unsigned char *) malloc(file_length); + fread(src, 1, file_length, fsrc); + fclose(fsrc); + //printf("C: %d bytes read from file\n",file_length); + } else { + // Preparing the transfer of the codestream from Java to C + //printf("C: before transfering codestream\n"); + fid = (*env)->GetFieldID(env, cls,"compressedStream", "[B"); + jba = (*env)->GetObjectField(env, obj, fid); + file_length = (*env)->GetArrayLength(env, jba); + jbBody = (*env)->GetByteArrayElements(env, jba, &isCopy); + src = (unsigned char*)jbBody; + } + + /* decode the code-stream */ + /* ---------------------- */ + + switch(parameters.decod_format) { + case J2K_CFMT: + { + /* JPEG-2000 codestream */ + + /* get a decoder handle */ + dinfo = opj_create_decompress(CODEC_J2K); + + /* catch events using our callbacks and give a local context */ + opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, &msgErrorCallback_vars); + + /* setup the decoder decoding parameters using user parameters */ + opj_setup_decoder(dinfo, ¶meters); + + /* open a byte stream */ + cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length); + + /* decode the stream and fill the image structure */ + image = opj_decode(dinfo, cio); + if(!image) { + fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n"); + opj_destroy_decompress(dinfo); + opj_cio_close(cio); + return 1; + } + + /* close the byte stream */ + opj_cio_close(cio); + } + break; + + case JP2_CFMT: + { + /* JPEG 2000 compressed image data */ + + /* get a decoder handle */ + dinfo = opj_create_decompress(CODEC_JP2); + + /* catch events using our callbacks and give a local context */ + opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, &msgErrorCallback_vars); + + /* setup the decoder decoding parameters using the current image and user parameters */ + opj_setup_decoder(dinfo, ¶meters); + + /* open a byte stream */ + cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length); + + /* decode the stream and fill the image structure */ + image = opj_decode(dinfo, cio); + if(!image) { + fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n"); + opj_destroy_decompress(dinfo); + opj_cio_close(cio); + return 1; + } + + /* close the byte stream */ + opj_cio_close(cio); + + } + break; + + case JPT_CFMT: + { + /* JPEG 2000, JPIP */ + + /* get a decoder handle */ + dinfo = opj_create_decompress(CODEC_JPT); + + /* catch events using our callbacks and give a local context */ + opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, &msgErrorCallback_vars); + + /* setup the decoder decoding parameters using user parameters */ + opj_setup_decoder(dinfo, ¶meters); + + /* open a byte stream */ + cio = opj_cio_open((opj_common_ptr)dinfo, src, file_length); + + /* decode the stream and fill the image structure */ + image = opj_decode(dinfo, cio); + if(!image) { + fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n"); + opj_destroy_decompress(dinfo); + opj_cio_close(cio); + return 1; + } + + /* close the byte stream */ + opj_cio_close(cio); + } + break; + + default: + fprintf(stderr, "skipping file..\n"); + continue; + } + + /* free the memory containing the code-stream */ + if (parameters.infile && parameters.infile[0]!='\0') { + free(src); + } else { + (*env)->ReleaseByteArrayElements(env, jba, jbBody, 0); + } + src = NULL; + + /* create output image. + If the -o parameter is given in the JavaParameters, write the decoded version into a file. + Implemented for debug purpose. */ + /* ---------------------------------- */ + switch (parameters.cod_format) { + case PXM_DFMT: /* PNM PGM PPM */ + if (imagetopnm(image, parameters.outfile)) { + fprintf(stdout,"Outfile %s not generated\n",parameters.outfile); + } + else { + fprintf(stdout,"Generated Outfile %s\n",parameters.outfile); + } + break; + + case PGX_DFMT: /* PGX */ + if(imagetopgx(image, parameters.outfile)){ + fprintf(stdout,"Outfile %s not generated\n",parameters.outfile); + } + else { + fprintf(stdout,"Generated Outfile %s\n",parameters.outfile); + } + break; + + case BMP_DFMT: /* BMP */ + if(imagetobmp(image, parameters.outfile)){ + fprintf(stdout,"Outfile %s not generated\n",parameters.outfile); + } + else { + fprintf(stdout,"Generated Outfile %s\n",parameters.outfile); + } + break; + + } + + // ========= Return the image to the Java structure =============== +#ifdef CHECK_THRESHOLDS + printf("C: checking thresholds\n"); +#endif + // First compute the real with and height, in function of the resolutions decoded. + //wr = (image->comps[0].w + (1 << image->comps[0].factor) -1) >> image->comps[0].factor; + //hr = (image->comps[0].h + (1 << image->comps[0].factor) -1) >> image->comps[0].factor; + w = image->comps[0].w; + h = image->comps[0].h; + + if (image->numcomps==3) { // 3 components color image + ptr = image->comps[0].data; + ptr1 = image->comps[1].data; + ptr2 = image->comps[2].data; +#ifdef CHECK_THRESHOLDS + if (image->comps[0].sgnd) { + min_value = 0; + max_value = 255; + } else { + min_value = -128; + max_value = 127; + } +#endif + // Get the pointer to the Java structure where the data must be copied + fid = (*env)->GetFieldID(env, cls,"image24", "[I"); + jia = (*env)->GetObjectField(env, obj, fid); + jiBody = (*env)->GetIntArrayElements(env, jia, 0); + ptrIBody = jiBody; + printf("C: transfering image24: %d int to Java pointer=%d\n",image->numcomps*w*h, ptrIBody); + + for (i=0; i max_value) + tempUC=max_value; + if (tempUC1 < min_value) + tempUC1=min_value; + else if (tempUC1 > max_value) + tempUC1=max_value; + if (tempUC2 < min_value) + tempUC2=min_value; + else if (tempUC2 > max_value) + tempUC2=max_value; +#endif + *(ptrIBody++) = (int) ( (tempUC2<<16) + (tempUC1<<8) + tempUC ); + } + (*env)->ReleaseIntArrayElements(env, jia, jiBody, 0); + + } else { // 1 component 8 or 16 bpp image + ptr = image->comps[0].data; + printf("C: before transfering a %d bpp image to java (length = %d)\n",image->comps[0].prec ,w*h); + if (image->comps[0].prec<=8) { + fid = (*env)->GetFieldID(env, cls,"image8", "[B"); + jba = (*env)->GetObjectField(env, obj, fid); + jbBody = (*env)->GetByteArrayElements(env, jba, 0); + ptrBBody = jbBody; +#ifdef CHECK_THRESHOLDS + if (image->comps[0].sgnd) { + min_value = 0; + max_value = 255; + } else { + min_value = -128; + max_value = 127; + } +#endif + //printf("C: transfering %d shorts to Java image8 pointer = %d\n", wr*hr,ptrSBody); + for (i=0; i max_value) + tempUC = max_value; +#endif + *(ptrBBody++) = tempUC; + } + (*env)->ReleaseByteArrayElements(env, jba, jbBody, 0); + printf("C: image8 transfered to Java\n"); + } else { + fid = (*env)->GetFieldID(env, cls,"image16", "[S"); + jsa = (*env)->GetObjectField(env, obj, fid); + jsBody = (*env)->GetShortArrayElements(env, jsa, 0); + ptrSBody = jsBody; +#ifdef CHECK_THRESHOLDS + if (image->comps[0].sgnd) { + min_value = 0; + max_value = 65535; + } else { + min_value = -32768; + max_value = 32767; + } + printf("C: minValue = %d, maxValue = %d\n", min_value, max_value); +#endif + printf("C: transfering %d shorts to Java image16 pointer = %d\n", w*h,ptrSBody); + for (i=0; i max_value) { + printf("C: value %d truncated to %d\n", tempS, max_value); + tempS = max_value; + } +#endif + *(ptrSBody++) = tempS; + } + (*env)->ReleaseShortArrayElements(env, jsa, jsBody, 0); + printf("C: image16 completely filled\n"); + } + } + + + /* free remaining structures */ + if(dinfo) { + opj_destroy_decompress(dinfo); + } + /* free image data structure */ + opj_image_destroy(image); + + } + return 1; /* OK */ +} +//end main + diff --git a/JavaOpenJPEG/Makefile b/JavaOpenJPEG/Makefile new file mode 100644 index 00000000..f38ff762 --- /dev/null +++ b/JavaOpenJPEG/Makefile @@ -0,0 +1,14 @@ +# Makefile for the main OpenJPEG codecs: j2k_to_image and image_to_j2k + +CFLAGS = -O3 -lstdc++ # -g -p -pg + +all: j2k_to_image image_to_j2k + +j2k_to_image: j2k_to_image.c ../libopenjpeg.a + gcc $(CFLAGS) compat/getopt.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff + +image_to_j2k: image_to_j2k.c ../libopenjpeg.a + gcc $(CFLAGS) compat/getopt.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff + +clean: + rm -f j2k_to_image image_to_j2k diff --git a/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaDecoder.java b/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaDecoder.java new file mode 100644 index 00000000..f976c27c --- /dev/null +++ b/JavaOpenJPEG/java sources/org/openJpeg/OpenJPEGJavaDecoder.java @@ -0,0 +1,230 @@ +/* + * $Id: $ + * + * Copyright (c) 1999-2007 Telemis SA. All Rights Reserved + + * Author: Patrick Piscaglia, Telemis s.a. +*/ +package org.openJpeg; + +import java.util.Vector; + +/** This class decodes one J2K codestream into an image (width + height + depth + pixels[], + * using the OpenJPEG.org library. + * To be able to log messages, the called must register a IJavaJ2KDecoderLogger object. + */ +public class OpenJPEGJavaDecoder { + + public interface IJavaJ2KDecoderLogger { + public void logDecoderMessage(String message); + public void logDecoderError(String message); + } + + private static boolean isInitialized = false; + + // ===== decompression parameters =============> + // These value may be changed for each image + private String[] decoder_arguments = null; + /** number of resolutions decompositions */ + private int nbResolutions = -1; + /** the quality layers */ + private int[] layers = null; + + /** Contains the 8 bpp version of the image. May NOT be filled together with image16 or image24.

+ * We store in Java the 8 or 16 bpp version of the image while the decoder uses a 32 bpp version, because

    + *
  • the storage capacity required is smaller + *
  • the transfer Java <-- C will be faster + *
  • the conversion byte/short ==> int will be done faster by the C + *
*/ + private byte[] image8 = null; + /** Contains the 16 bpp version of the image. May NOT be filled together with image8 or image24*/ + private short[] image16 = null; + /** Contains the 24 bpp version of the image. May NOT be filled together with image8 or image16 */ + private int[] image24 = null; + /** Holds the J2K compressed bytecode to decode */ + private byte compressedStream[] = null; + /** Holds the compressed version of the index file, to be used by the decoder */ + private byte compressedIndex[] = null; + /** Width and Height of the image */ + private int width = -1; + private int height = -1; + private int depth = -1; + /** This parameter is never used in Java but is read by the C library to know the number of resolutions to skip when decoding, + * i.e. if there are 5 resolutions and skipped=1 ==> decode until resolution 4. */ + private int skippedResolutions = 0; + + private Vector loggers = new Vector(); + + + public OpenJPEGJavaDecoder(String openJPEGlibraryFullPathAndName, IJavaJ2KDecoderLogger messagesAndErrorsLogger) throws ExceptionInInitializerError + { + this(openJPEGlibraryFullPathAndName); + loggers.addElement(messagesAndErrorsLogger); + } + + public OpenJPEGJavaDecoder(String openJPEGlibraryFullPathAndName) throws ExceptionInInitializerError + { + if (!isInitialized) { + try { + System.load(openJPEGlibraryFullPathAndName); + isInitialized = true; + } catch (Throwable t) { + throw new ExceptionInInitializerError("OpenJPEG Java Decoder: probably impossible to find the C library"); + } + } + } + + public void addLogger(IJavaJ2KDecoderLogger messagesAndErrorsLogger) { + loggers.addElement(messagesAndErrorsLogger); + } + + public void removeLogger(IJavaJ2KDecoderLogger messagesAndErrorsLogger) { + loggers.removeElement(messagesAndErrorsLogger); + } + + public int decodeJ2KtoImage() { + if ((image16 == null || (image16 != null && image16.length != width*height)) && (depth==-1 || depth==16)) { + image16 = new short[width*height]; + logMessage("OpenJPEGJavaDecoder.decompressImage: image16 length = " + image16.length + " (" + width + " x " + height + ") "); + } + if ((image8 == null || (image8 != null && image8.length != width*height)) && (depth==-1 || depth==8)) { + image8 = new byte[width*height]; + logMessage("OpenJPEGJavaDecoder.decompressImage: image8 length = " + image8.length + " (" + width + " x " + height + ") "); + } + if ((image24 == null || (image24 != null && image24.length != width*height)) && (depth==-1 || depth==24)) { + image24 = new int[width*height]; + logMessage("OpenJPEGJavaDecoder.decompressImage: image24 length = " + image24.length + " (" + width + " x " + height + ") "); + } + + String[] arguments = new String[0 + (decoder_arguments != null ? decoder_arguments.length : 0)]; + int offset = 0; + if (decoder_arguments != null) { + for (int i=0; i + // These value may be changed for each image + private String[] encoder_arguments = null; + /** number of resolutions decompositions */ + private int nbResolutions = -1; + /** the quality layers, expressed as compression rate */ + private float[] ratioLayers = null; + /** the quality layers, expressed as PSNR values. This variable, if defined, has priority over the ratioLayers variable */ + private float[] psnrLayers = null; + + /** Contains the 8 bpp version of the image. May NOT be filled together with image16 or image24.

+ * We store the 8 or 16 bpp version of the original image while the encoder uses a 32 bpp version, because

    + *
  • the storage capacity required is smaller + *
  • the transfer Java --> C will be faster + *
  • the conversion byte/short ==> int will be done faster by the C + *
*/ + private byte[] image8 = null; + /** Contains the 16 bpp version of the image. May NOT be filled together with image8 or image24*/ + private short[] image16 = null; + /** Contains the 24 bpp version of the image. May NOT be filled together with image8 or image16 */ + private int[] image24 = null; + /** Holds the result of the compression, i.e. the J2K compressed bytecode */ + private byte compressedStream[] = null; + /** Holds the compressed stream length, which may be smaller than compressedStream.length if this byte[] is pre-allocated */ + private long compressedStreamLength = -1; + /** Holds the compressed version of the index file, returned by the encoder */ + private byte compressedIndex[] = null; + /** Width and Height of the image */ + private int width = -1; + private int height = -1; + private int depth = -1; + /** Tile size. We suppose the same size for the horizontal and vertical tiles. + * If size == -1 ==> no tiling */ + private int tileSize = -1; + // <===== Compression parameters ============= + + private Vector loggers = new Vector(); + + public OpenJPEGJavaEncoder(String openJPEGlibraryFullPathAndName, IJavaJ2KEncoderLogger messagesAndErrorsLogger) throws ExceptionInInitializerError + { + this(openJPEGlibraryFullPathAndName); + loggers.addElement(messagesAndErrorsLogger); + } + + public OpenJPEGJavaEncoder(String openJPEGlibraryFullPathAndName) throws ExceptionInInitializerError + { + if (!isInitialized) { + try { + String absolutePath = (new File(openJPEGlibraryFullPathAndName)).getCanonicalPath(); + System.load(absolutePath); + isInitialized = true; + } catch (Throwable t) { + t.printStackTrace(); + throw new ExceptionInInitializerError("OpenJPEG Java Encoder: probably impossible to find the C library"); + } + } + } + + public void addLogger(IJavaJ2KEncoderLogger messagesAndErrorsLogger) { + loggers.addElement(messagesAndErrorsLogger); + } + + public void removeLogger(IJavaJ2KEncoderLogger messagesAndErrorsLogger) { + loggers.removeElement(messagesAndErrorsLogger); + } + + /** This method compresses the given image.

+ * It returns the compressed J2K codestream into the compressedStream byte[].

+ * It also returns the compression index as a compressed form, into the compressedIndex byte[].

+ * One of the image8, image16 or image24 arrays must be correctly initialized and filled.

+ * The width, height and depth variables must be correctly filled.

+ * The nbResolutions, nbLayers and if needed the float[] psnrLayers or ratioLayers must also be filled before calling this method. + */ + public void encodeImageToJ2K() { + // Need to allocate / reallocate the compressed stream buffer ? (size = max possible size = original image size) + if (compressedStream== null || (compressedStream.length != width*height*depth/8)) { + logMessage("OpenJPEGJavaEncoder.encodeImageToJ2K: (re-)allocating " + (width*height*depth/8) + " bytes for the compressedStream"); + compressedStream = new byte[width*height*depth/8]; + } + // Arguments = + // - number of resolutions "-n 5" : 2 + // - size of tile "-t 512,512" : 2 + // + // Image width, height, depth and pixels are directly fetched by C from the Java class + int nbArgs = 2 + (tileSize == -1 ? 0 : 2) + (encoder_arguments != null ? encoder_arguments.length : 0); + if (psnrLayers != null && psnrLayers.length>0 && psnrLayers[0] != 0) + // If psnrLayers is defined and doesn't just express "lossless" + nbArgs += 2; + else if (ratioLayers != null && ratioLayers.length>0 && ratioLayers[0]!=0.0) + nbArgs += 2; + String[] arguments = new String[nbArgs]; + int offset = 0; + arguments[offset] = "-n"; arguments[offset+1] = "" + nbResolutions; offset += 2; + if (tileSize!= -1) { + arguments[offset++] = "-t"; + arguments[offset++] = "" + tileSize + "," + tileSize; + } + // If PSNR layers are defined, use them to encode the images + if (psnrLayers != null && psnrLayers.length>0 && psnrLayers[0]!=-1) { + arguments[offset++] = "-q"; + String s = ""; + for (int i=0; i0 && ratioLayers[0]!=0.0) { + // Specify quality ratioLayers, as compression ratios + arguments[offset++] = "-r"; + String s = ""; + for (int i=0; i +/* Header for class org_openJpeg_OpenJPEGJavaDecoder */ + +#ifndef _Included_org_openJpeg_OpenJPEGJavaDecoder +#define _Included_org_openJpeg_OpenJPEGJavaDecoder +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: org_openJpeg_OpenJPEGJavaDecoder + * Method: internalDecodeJ2KtoImage + * Signature: ([Ljava/lang/String;)I + */ +JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2KtoImage + (JNIEnv *, jobject, jobjectArray); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h b/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h new file mode 100644 index 00000000..22b3d958 --- /dev/null +++ b/JavaOpenJPEG/org_openJpeg_OpenJPEGJavaEncoder.h @@ -0,0 +1,21 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class org_openJpeg_OpenJPEGJavaEncoder */ + +#ifndef _Included_org_openJpeg_OpenJPEGJavaEncoder +#define _Included_org_openJpeg_OpenJPEGJavaEncoder +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: org_openJpeg_OpenJPEGJavaEncoder + * Method: internalEncodeImageToJ2K + * Signature: ([Ljava/lang/String;)J + */ +JNIEXPORT jlong JNICALL Java_org_openJpeg_OpenJPEGJavaEncoder_internalEncodeImageToJ2K + (JNIEnv *, jobject, jobjectArray); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/codec/compat/getopt.c b/codec/compat/getopt.c index 23270e6a..f434924b 100644 --- a/codec/compat/getopt.c +++ b/codec/compat/getopt.c @@ -59,7 +59,11 @@ typedef struct option #define BADARG (int)':' #define EMSG "" - +/* As this class remembers its values from one Java call to the other, reset the values before each use */ +void reset_options_reading() { + opterr = 1; + optind = 1; +} /* * getopt -- @@ -132,7 +136,7 @@ struct option *longopts, int totlen) { char param = 1; again: - if (optind>argc || !argv[optind] || *argv[optind]!='-') + if (optind >= argc || !argv[optind] || *argv[optind]!='-') return -1; if (argv[optind][0]=='-' && argv[optind][1]==0) { diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c index f505e997..7fbd5a8a 100644 --- a/codec/image_to_j2k.c +++ b/codec/image_to_j2k.c @@ -1692,7 +1692,7 @@ int main(int argc, char **argv) { if (*indexfilename) { bSuccess = write_index_file(&cstr_info, indexfilename); if (bSuccess) { - fprintf(stderr, "Failed to output index file\n"); + fprintf(stderr, "Failed to output index file into [%s]\n", indexfilename); } } diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c index 95cfd93e..4a58ebeb 100644 --- a/libopenjpeg/tcd.c +++ b/libopenjpeg/tcd.c @@ -1384,9 +1384,9 @@ bool tcd_decode_tile(opj_tcd_t *tcd, unsigned char *src, int len, int tileno, op if (tcd->cp->reduce != 0) { tcd->image->comps[compno].resno_decoded = tile->comps[compno].numresolutions - tcd->cp->reduce - 1; - if (tcd->image->comps[compno].resno_decoded < 0) { - opj_event_msg(tcd->cinfo, EVT_ERROR, "Error decoding tile. The number of resolutions to remove is higher than the number " - "of resolutions in the original codestream\nModify the cp_reduce parameter.\n"); + if (tcd->image->comps[compno].resno_decoded < 0) { + opj_event_msg(tcd->cinfo, EVT_ERROR, "Error decoding tile. The number of resolutions to remove [%d+1] is higher than the number " + " of resolutions in the original codestream [%d]\nModify the cp_reduce parameter.\n", tcd->cp->reduce, tile->comps[compno].numresolutions); return false; } }