fprintf(stdout, "-i <file>\n");
fprintf(stdout, " Input file\n");
fprintf(stdout,
- " Known extensions are <PBM|PGM|PPM|PNM|PAM|PGX|PNG|BMP|TIF|RAW|RAWL|TGA>\n");
+ " Known extensions are <PBM|PGM|PPM|PNM|PAM|PGX|PNG|BMP|TIF|TIFF|RAW|YUV|RAWL|TGA>\n");
fprintf(stdout, " If used, '-o <file>' must be provided\n");
fprintf(stdout, "-o <compressed file>\n");
fprintf(stdout, " Output file (accepted extensions are j2k or jp2).\n");
fprintf(stdout, " Required only if -ImgDir is used\n");
fprintf(stdout,
"-F <width>,<height>,<ncomp>,<bitdepth>,{s,u}@<dx1>x<dy1>:...:<dxn>x<dyn>\n");
- fprintf(stdout, " Characteristics of the raw input image\n");
+ fprintf(stdout, " Characteristics of the raw or yuv input image\n");
fprintf(stdout,
" If subsampling is omitted, 1x1 is assumed for all components\n");
- fprintf(stdout, " Example: -F 512,512,3,8,u@1x1:2x2:2x2\n");
+ fprintf(stdout, " Example: -F 512,512,3,8,u@1x1:2x2:2x2\n");
fprintf(stdout,
- " for raw 512x512 image with 4:2:0 subsampling\n");
+ " for raw or yuv 512x512 size with 4:2:0 subsampling\n");
fprintf(stdout, " Required only if RAW or RAWL input file is provided.\n");
fprintf(stdout, "\n");
fprintf(stdout, "Optional Parameters:\n");
fprintf(stdout, " Different compression ratios for successive layers.\n");
fprintf(stdout,
" The rate specified for each quality level is the desired\n");
- fprintf(stdout, " compression factor.\n");
+ fprintf(stdout, " compression factor (use 1 for lossless)\n");
fprintf(stdout, " Decreasing ratios required.\n");
fprintf(stdout, " Example: -r 20,10,1 means \n");
fprintf(stdout, " quality layer 1: compress 20x, \n");
fprintf(stdout, " Options -r and -q cannot be used together.\n");
fprintf(stdout, "-q <psnr value>,<psnr value>,<psnr value>,...\n");
fprintf(stdout, " Different psnr for successive layers (-q 30,40,50).\n");
- fprintf(stdout, " Increasing PSNR values required.\n");
+ fprintf(stdout, " Increasing PSNR values required, except 0 which can\n");
+ fprintf(stdout, " be used for the last layer to indicate it is lossless.\n");
fprintf(stdout, " Options -r and -q cannot be used together.\n");
fprintf(stdout, "-n <number of resolutions>\n");
fprintf(stdout, " Number of resolutions.\n");
fprintf(stdout,
" to the highest resolution level and subsequent records to lower \n");
fprintf(stdout,
- " resolution levels. The last specified record is right-shifted for each \n");
+ " resolution levels. The last specified record is halved successively for each \n");
fprintf(stdout, " remaining lower resolution levels.\n");
- fprintf(stdout, " Default: 215x215 at each resolution.\n");
+ fprintf(stdout, " Default: 2^15x2^15 at each resolution.\n");
fprintf(stdout, "-t <tile width>,<tile height>\n");
fprintf(stdout, " Tile size.\n");
fprintf(stdout,
fprintf(stdout, " Write SOP marker before each packet.\n");
fprintf(stdout, "-EPH\n");
fprintf(stdout, " Write EPH marker after each header packet.\n");
+ fprintf(stdout, "-PLT\n");
+ fprintf(stdout, " Write PLT marker in tile-part header.\n");
fprintf(stdout, "-M <key value>\n");
fprintf(stdout, " Mode switch.\n");
fprintf(stdout, " [1=BYPASS(LAZY) 2=RESET 4=RESTART(TERMALL)\n");
fprintf(stdout, "-cinema4K\n");
fprintf(stdout, " Digital Cinema 4K profile compliant codestream.\n");
fprintf(stdout, " Frames per second not required. Default value is 24fps.\n");
+ fprintf(stdout, "-IMF <PROFILE>[,mainlevel=X][,sublevel=Y][,framerate=FPS]\n");
+ fprintf(stdout, " Interoperable Master Format compliant codestream.\n");
+ fprintf(stdout, " <PROFILE>=2K, 4K, 8K, 2K_R, 4K_R or 8K_R.\n");
+ fprintf(stdout, " X >= 0 and X <= 11.\n");
+ fprintf(stdout, " Y >= 0 and Y <= 9.\n");
+ fprintf(stdout,
+ " framerate > 0 may be specified to enhance checks and set maximum bit rate when Y > 0.\n");
fprintf(stdout, "-jpip\n");
fprintf(stdout, " Write jpip codestream index box in JP2 output file.\n");
fprintf(stdout, " Currently supports only RPCL order.\n");
fprintf(stdout, "-C <comment>\n");
fprintf(stdout, " Add <comment> in the comment marker segment.\n");
+ if (opj_has_thread_support()) {
+ fprintf(stdout, " -threads <num_threads|ALL_CPUS>\n"
+ " Number of threads to use for encoding or ALL_CPUS for all available cores.\n");
+ }
/* UniPG>> */
#ifdef USE_JPWL
fprintf(stdout, "-W <params>\n");
JPWL_MAX_NO_TILESPECS);
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, " to be applied to raw or yuv data: 'type' can be\n");
fprintf(stdout,
" [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]\n");
fprintf(stdout,
{
unsigned int i;
static const char *extension[] = {
- "pgx", "pnm", "pgm", "ppm", "pbm", "pam", "bmp", "tif", "raw", "rawl", "tga", "png", "j2k", "jp2", "j2c", "jpc"
+ "pgx", "pnm", "pgm", "ppm", "pbm", "pam", "bmp", "tif", "tiff", "raw", "yuv", "rawl", "tga", "png", "j2k", "jp2", "j2c", "jpc"
};
static const int format[] = {
- PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT
+ PGX_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, PXM_DFMT, BMP_DFMT, TIF_DFMT, TIF_DFMT, RAW_DFMT, RAW_DFMT, RAWL_DFMT, TGA_DFMT, PNG_DFMT, J2K_CFMT, JP2_CFMT, J2K_CFMT, J2K_CFMT
};
char * ext = strrchr(filename, '.');
if (ext == NULL) {
static int parse_cmdline_encoder(int argc, char **argv,
opj_cparameters_t *parameters,
img_fol_t *img_fol, raw_cparameters_t *raw_cp, char *indexfilename,
- size_t indexfilename_size)
+ size_t indexfilename_size,
+ int* pOutFramerate,
+ OPJ_BOOL* pOutPLT,
+ int* pOutNumThreads)
{
OPJ_UINT32 i, j;
int totlen, c;
{"POC", REQ_ARG, NULL, 'P'},
{"ROI", REQ_ARG, NULL, 'R'},
{"jpip", NO_ARG, NULL, 'J'},
- {"mct", REQ_ARG, NULL, 'Y'}
+ {"mct", REQ_ARG, NULL, 'Y'},
+ {"IMF", REQ_ARG, NULL, 'Z'},
+ {"PLT", NO_ARG, NULL, 'A'},
+ {"threads", REQ_ARG, NULL, 'B'}
};
/* parse the command line */
default:
fprintf(stderr,
"[ERROR] Unknown input file format: %s \n"
- " Known file formats are *.pnm, *.pgm, *.ppm, *.pgx, *png, *.bmp, *.tif, *.raw or *.tga\n",
+ " Known file formats are *.pnm, *.pgm, *.ppm, *.pgx, *png, *.bmp, *.tif(f), *.raw, *.yuv or *.tga\n",
infile);
return 1;
}
}
free(substr1);
if (wrong) {
- fprintf(stderr, "\nError: invalid raw image parameters\n");
+ fprintf(stderr, "\nError: invalid raw or yuv image parameters\n");
fprintf(stderr, "Please use the Format option -F:\n");
fprintf(stderr,
"-F <width>,<height>,<ncomp>,<bitdepth>,{s,u}@<dx1>x<dy1>:...:<dxn>x<dyn>\n");
"If subsampling is omitted, 1x1 is assumed for all components\n");
fprintf(stderr,
"Example: -i image.raw -o image.j2k -F 512,512,3,8,u@1x1:2x2:2x2\n");
- fprintf(stderr, " for raw 512x512 image with 4:2:0 subsampling\n");
+ fprintf(stderr,
+ " for raw or yuv 512x512 size with 4:2:0 subsampling\n");
fprintf(stderr, "Aborting.\n");
return 1;
}
parameters->tcp_numlayers = (int)numlayers;
numresolution = (OPJ_UINT32)parameters->numresolution;
matrix_width = numresolution * 3;
- parameters->cp_matrice = (int *) malloc(numlayers * matrix_width * sizeof(int));
+ parameters->cp_matrice = (int *) malloc(sizeof(int) * numlayers * matrix_width);
if (parameters->cp_matrice == NULL) {
return 1;
}
case 'b': { /* code-block dimension */
int cblockw_init = 0, cblockh_init = 0;
sscanf(opj_optarg, "%d,%d", &cblockw_init, &cblockh_init);
- if (cblockw_init * cblockh_init > 4096 || cblockw_init > 1024
- || cblockw_init < 4 || cblockh_init > 1024 || cblockh_init < 4) {
+ if (cblockw_init > 1024 || cblockw_init < 4 ||
+ cblockh_init > 1024 || cblockh_init < 4 ||
+ cblockw_init * cblockh_init > 4096) {
fprintf(stderr,
"!! Size of code_block error (option -b) !!\n\nRestriction :\n"
" * width*height<=4096\n * 4<=width,height<= 1024\n\n");
/* ------------------------------------------------------ */
+ case 'Z': { /* IMF profile*/
+ int mainlevel = 0;
+ int sublevel = 0;
+ int profile = 0;
+ int framerate = 0;
+ const char* msg =
+ "Wrong value for -IMF. Should be "
+ "<PROFILE>[,mainlevel=X][,sublevel=Y][,framerate=FPS] where <PROFILE> is one "
+ "of 2K/4K/8K/2K_R/4K_R/8K_R.\n";
+ char* comma;
+
+ comma = strstr(opj_optarg, ",mainlevel=");
+ if (comma && sscanf(comma + 1, "mainlevel=%d", &mainlevel) != 1) {
+ fprintf(stderr, "%s", msg);
+ return 1;
+ }
+
+ comma = strstr(opj_optarg, ",sublevel=");
+ if (comma && sscanf(comma + 1, "sublevel=%d", &sublevel) != 1) {
+ fprintf(stderr, "%s", msg);
+ return 1;
+ }
+
+ comma = strstr(opj_optarg, ",framerate=");
+ if (comma && sscanf(comma + 1, "framerate=%d", &framerate) != 1) {
+ fprintf(stderr, "%s", msg);
+ return 1;
+ }
+
+ comma = strchr(opj_optarg, ',');
+ if (comma != NULL) {
+ *comma = 0;
+ }
+
+ if (strcmp(opj_optarg, "2K") == 0) {
+ profile = OPJ_PROFILE_IMF_2K;
+ } else if (strcmp(opj_optarg, "4K") == 0) {
+ profile = OPJ_PROFILE_IMF_4K;
+ } else if (strcmp(opj_optarg, "8K") == 0) {
+ profile = OPJ_PROFILE_IMF_8K;
+ } else if (strcmp(opj_optarg, "2K_R") == 0) {
+ profile = OPJ_PROFILE_IMF_2K_R;
+ } else if (strcmp(opj_optarg, "4K_R") == 0) {
+ profile = OPJ_PROFILE_IMF_4K_R;
+ } else if (strcmp(opj_optarg, "8K_R") == 0) {
+ profile = OPJ_PROFILE_IMF_8K_R;
+ } else {
+ fprintf(stderr, "%s", msg);
+ return 1;
+ }
+
+ if (!(mainlevel >= 0 && mainlevel <= 15)) {
+ /* Voluntarily rough validation. More fine grained done in library */
+ fprintf(stderr, "Invalid mainlevel value.\n");
+ return 1;
+ }
+ if (!(sublevel >= 0 && sublevel <= 15)) {
+ /* Voluntarily rough validation. More fine grained done in library */
+ fprintf(stderr, "Invalid sublevel value.\n");
+ return 1;
+ }
+ parameters->rsiz = (OPJ_UINT16)(profile | (sublevel << 4) | mainlevel);
+
+ fprintf(stdout, "IMF profile activated\n"
+ "Other options specified could be overridden\n");
+
+ if (pOutFramerate) {
+ *pOutFramerate = framerate;
+ }
+ if (framerate > 0 && sublevel > 0 && sublevel <= 9) {
+ const int limitMBitsSec[] = {
+ 0,
+ OPJ_IMF_SUBLEVEL_1_MBITSSEC,
+ OPJ_IMF_SUBLEVEL_2_MBITSSEC,
+ OPJ_IMF_SUBLEVEL_3_MBITSSEC,
+ OPJ_IMF_SUBLEVEL_4_MBITSSEC,
+ OPJ_IMF_SUBLEVEL_5_MBITSSEC,
+ OPJ_IMF_SUBLEVEL_6_MBITSSEC,
+ OPJ_IMF_SUBLEVEL_7_MBITSSEC,
+ OPJ_IMF_SUBLEVEL_8_MBITSSEC,
+ OPJ_IMF_SUBLEVEL_9_MBITSSEC
+ };
+ parameters->max_cs_size = limitMBitsSec[sublevel] * (1000 * 1000 / 8) /
+ framerate;
+ fprintf(stdout, "Setting max codestream size to %d bytes.\n",
+ parameters->max_cs_size);
+ }
+ }
+ break;
+
+ /* ------------------------------------------------------ */
+
case 'Y': { /* Shall we do an MCT ? 0:no_mct;1:rgb->ycc;2:custom mct (-m option required)*/
int mct_mode = 0;
sscanf(opj_optarg, "%d", &mct_mode);
break;
/* ------------------------------------------------------ */
+ case 'A': { /* PLT markers */
+ *pOutPLT = OPJ_TRUE;
+ }
+ break;
+
+ /* ----------------------------------------------------- */
+ case 'B': { /* Number of threads */
+ if (strcmp(opj_optarg, "ALL_CPUS") == 0) {
+ *pOutNumThreads = opj_get_num_cpus();
+ if (*pOutNumThreads == 1) {
+ *pOutNumThreads = 0;
+ }
+ } else {
+ sscanf(opj_optarg, "%d", pOutNumThreads);
+ }
+ }
+ break;
+
+ /* ------------------------------------------------------ */
+
default:
fprintf(stderr, "[WARNING] An invalid option has been ignored\n");
}
}
- if ((parameters->decod_format == RAW_DFMT && raw_cp->rawWidth == 0)
- || (parameters->decod_format == RAWL_DFMT && raw_cp->rawWidth == 0)) {
- fprintf(stderr, "[ERROR] invalid raw image parameters\n");
+ if ((parameters->decod_format == RAW_DFMT ||
+ parameters->decod_format == RAWL_DFMT)
+ && (raw_cp->rawWidth == 0)) {
+ fprintf(stderr, "[ERROR] invalid raw or yuv image parameters\n");
fprintf(stderr, "Please use the Format option -F:\n");
fprintf(stderr,
"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
return 1;
} /* mod fixed_quality */
+
/* if no rate entered, lossless by default */
+ /* Note: post v2.2.0, this is no longer necessary, but for released */
+ /* versions at the time of writing, this is needed to avoid crashes */
if (parameters->tcp_numlayers == 0) {
- parameters->tcp_rates[0] = 0; /* MOD antonin : losslessbug */
+ parameters->tcp_rates[0] = 0;
parameters->tcp_numlayers++;
parameters->cp_disto_alloc = 1;
}
/* cout << "freq = " << ((double) freq.QuadPart) << endl; */
/* t is the high resolution performance counter (see MSDN) */
QueryPerformanceCounter(& t) ;
- return freq.QuadPart ? (t.QuadPart / (OPJ_FLOAT64) freq.QuadPart) : 0 ;
+ return freq.QuadPart ? ((OPJ_FLOAT64) t.QuadPart / (OPJ_FLOAT64) freq.QuadPart)
+ : 0 ;
#else
/* Unix or Linux: use resource usage */
struct rusage t;
img_fol_t img_fol;
dircnt_t *dirptr = NULL;
+ int ret = 0;
+
OPJ_BOOL bSuccess;
OPJ_BOOL bUseTiles = OPJ_FALSE; /* OPJ_TRUE */
OPJ_UINT32 l_nb_tiles = 4;
+ int framerate = 0;
OPJ_FLOAT64 t = opj_clock();
+ OPJ_BOOL PLT = OPJ_FALSE;
+ int num_threads = 0;
+
/* set encoding parameters to default values */
opj_set_default_encoder_parameters(¶meters);
parameters.tcp_mct = (char)
255; /* This will be set later according to the input image or the provided option */
if (parse_cmdline_encoder(argc, argv, ¶meters, &img_fol, &raw_cp,
- indexfilename, sizeof(indexfilename)) == 1) {
- goto fails;
+ indexfilename, sizeof(indexfilename), &framerate, &PLT, &num_threads) == 1) {
+ ret = 1;
+ goto fin;
}
/* Read directory if necessary */
char)); /* Stores at max 10 image file names*/
dirptr->filename = (char**) malloc(num_images * sizeof(char*));
if (!dirptr->filename_buf) {
- return 0;
+ ret = 0;
+ goto fin;
}
for (i = 0; i < num_images; i++) {
dirptr->filename[i] = dirptr->filename_buf + i * OPJ_PATH_LEN;
}
}
if (load_images(dirptr, img_fol.imgdirpath) == 1) {
- return 0;
+ ret = 0;
+ goto fin;
}
if (num_images == 0) {
fprintf(stdout, "Folder is empty\n");
- return 0;
+ ret = 0;
+ goto fin;
}
} else {
num_images = 1;
switch (parameters.decod_format) {
case PGX_DFMT:
- break;
case PXM_DFMT:
- break;
case BMP_DFMT:
- break;
case TIF_DFMT:
- break;
case RAW_DFMT:
case RAWL_DFMT:
- break;
case TGA_DFMT:
- break;
case PNG_DFMT:
break;
default:
image = pgxtoimage(parameters.infile, ¶meters);
if (!image) {
fprintf(stderr, "Unable to load pgx file\n");
- return 1;
+ ret = 1;
+ goto fin;
}
break;
image = pnmtoimage(parameters.infile, ¶meters);
if (!image) {
fprintf(stderr, "Unable to load pnm file\n");
- return 1;
+ ret = 1;
+ goto fin;
}
break;
image = bmptoimage(parameters.infile, ¶meters);
if (!image) {
fprintf(stderr, "Unable to load bmp file\n");
- return 1;
+ ret = 1;
+ goto fin;
}
break;
case TIF_DFMT:
image = tiftoimage(parameters.infile, ¶meters);
if (!image) {
- fprintf(stderr, "Unable to load tiff file\n");
- return 1;
+ fprintf(stderr, "Unable to load tif(f) file\n");
+ ret = 1;
+ goto fin;
}
break;
#endif /* OPJ_HAVE_LIBTIFF */
case RAW_DFMT:
image = rawtoimage(parameters.infile, ¶meters, &raw_cp);
if (!image) {
- fprintf(stderr, "Unable to load raw file\n");
- return 1;
+ fprintf(stderr, "Unable to load raw or yuv file\n");
+ ret = 1;
+ goto fin;
}
break;
image = rawltoimage(parameters.infile, ¶meters, &raw_cp);
if (!image) {
fprintf(stderr, "Unable to load raw file\n");
- return 1;
+ ret = 1;
+ goto fin;
}
break;
image = tgatoimage(parameters.infile, ¶meters);
if (!image) {
fprintf(stderr, "Unable to load tga file\n");
- return 1;
+ ret = 1;
+ goto fin;
}
break;
image = pngtoimage(parameters.infile, ¶meters);
if (!image) {
fprintf(stderr, "Unable to load png file\n");
- return 1;
+ ret = 1;
+ goto fin;
}
break;
#endif /* OPJ_HAVE_LIBPNG */
}
- /* Can happen if input file is TIFF or PNG
+ /* Can happen if input file is TIF(F) or PNG
* and OPJ_HAVE_LIBTIF or OPJ_HAVE_LIBPNG is undefined
*/
if (!image) {
fprintf(stderr, "Unable to load file: got no image\n");
- return 1;
+ ret = 1;
+ goto fin;
}
/* Decide if MCT should be used */
if ((parameters.tcp_mct == 1) && (image->numcomps < 3)) {
fprintf(stderr, "RGB->YCC conversion cannot be used:\n");
fprintf(stderr, "Input image has less than 3 components\n");
- return 1;
+ ret = 1;
+ goto fin;
}
if ((parameters.tcp_mct == 2) && (!parameters.mct_data)) {
fprintf(stderr, "Custom MCT has been set but no array-based MCT\n");
fprintf(stderr, "has been provided. Aborting.\n");
- return 1;
+ ret = 1;
+ goto fin;
+ }
+ }
+
+ if (OPJ_IS_IMF(parameters.rsiz) && framerate > 0) {
+ const int mainlevel = OPJ_GET_IMF_MAINLEVEL(parameters.rsiz);
+ if (mainlevel > 0 && mainlevel <= OPJ_IMF_MAINLEVEL_MAX) {
+ const int limitMSamplesSec[] = {
+ 0,
+ OPJ_IMF_MAINLEVEL_1_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_2_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_3_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_4_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_5_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_6_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_7_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_8_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_9_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_10_MSAMPLESEC,
+ OPJ_IMF_MAINLEVEL_11_MSAMPLESEC
+ };
+ OPJ_UINT32 avgcomponents = image->numcomps;
+ double msamplespersec;
+ if (image->numcomps == 3 &&
+ image->comps[1].dx == 2 &&
+ image->comps[1].dy == 2) {
+ avgcomponents = 2;
+ }
+ msamplespersec = (double)image->x1 * image->y1 * avgcomponents * framerate /
+ 1e6;
+ if (msamplespersec > limitMSamplesSec[mainlevel]) {
+ fprintf(stderr,
+ "Warning: MSamples/sec is %f, whereas limit is %d.\n",
+ msamplespersec,
+ limitMSamplesSec[mainlevel]);
+ }
}
}
fprintf(stderr, "failed to encode image: opj_setup_encoder\n");
opj_destroy_codec(l_codec);
opj_image_destroy(image);
- return 1;
+ ret = 1;
+ goto fin;
+ }
+
+ if (PLT) {
+ const char* const options[] = { "PLT=YES", NULL };
+ if (!opj_encoder_set_extra_options(l_codec, options)) {
+ fprintf(stderr, "failed to encode image: opj_encoder_set_extra_options\n");
+ opj_destroy_codec(l_codec);
+ opj_image_destroy(image);
+ ret = 1;
+ goto fin;
+ }
+ }
+
+ if (num_threads >= 1 &&
+ !opj_codec_set_threads(l_codec, num_threads)) {
+ fprintf(stderr, "failed to set number of threads\n");
+ opj_destroy_codec(l_codec);
+ opj_image_destroy(image);
+ ret = 1;
+ goto fin;
}
/* open a byte stream for writing and allocate memory for all tiles */
l_stream = opj_stream_create_default_file_stream(parameters.outfile, OPJ_FALSE);
if (! l_stream) {
- return 1;
+ ret = 1;
+ goto fin;
}
/* encode the image */
OPJ_UINT32 l_data_size = 512 * 512 * 3;
l_data = (OPJ_BYTE*) calloc(1, l_data_size);
if (l_data == NULL) {
- goto fails;
+ ret = 1;
+ goto fin;
}
for (i = 0; i < l_nb_tiles; ++i) {
if (! opj_write_tile(l_codec, i, l_data, l_data_size, l_stream)) {
opj_stream_destroy(l_stream);
opj_destroy_codec(l_codec);
opj_image_destroy(image);
- return 1;
+ ret = 1;
+ goto fin;
}
}
free(l_data);
opj_image_destroy(image);
fprintf(stderr, "failed to encode image\n");
remove(parameters.outfile);
- return 1;
+ ret = 1;
+ goto fin;
}
num_compressed_files++;
}
- /* free user parameters structure */
- if (parameters.cp_comment) {
- free(parameters.cp_comment);
- }
- if (parameters.cp_matrice) {
- free(parameters.cp_matrice);
- }
- if (raw_cp.rawComps) {
- free(raw_cp.rawComps);
- }
-
t = opj_clock() - t;
if (num_compressed_files) {
fprintf(stdout, "encode time: %d ms \n",
(int)((t * 1000.0) / (OPJ_FLOAT64)num_compressed_files));
}
- return 0;
+ ret = 0;
-fails:
+fin:
if (parameters.cp_comment) {
free(parameters.cp_comment);
}
}
free(dirptr);
}
- return 1;
+ return ret;
}
projects / openjpeg.git / blobdiff