Import files tiff and yuv(raw)
This commit is contained in:
parent
b897e2cb36
commit
3f1e8dc862
|
@ -141,7 +141,7 @@ static void encode_help_display(void)
|
||||||
fprintf(stdout, "-i <file>\n");
|
fprintf(stdout, "-i <file>\n");
|
||||||
fprintf(stdout, " Input file\n");
|
fprintf(stdout, " Input file\n");
|
||||||
fprintf(stdout,
|
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, " If used, '-o <file>' must be provided\n");
|
||||||
fprintf(stdout, "-o <compressed file>\n");
|
fprintf(stdout, "-o <compressed file>\n");
|
||||||
fprintf(stdout, " Output file (accepted extensions are j2k or jp2).\n");
|
fprintf(stdout, " Output file (accepted extensions are j2k or jp2).\n");
|
||||||
|
@ -153,12 +153,12 @@ static void encode_help_display(void)
|
||||||
fprintf(stdout, " Required only if -ImgDir is used\n");
|
fprintf(stdout, " Required only if -ImgDir is used\n");
|
||||||
fprintf(stdout,
|
fprintf(stdout,
|
||||||
"-F <width>,<height>,<ncomp>,<bitdepth>,{s,u}@<dx1>x<dy1>:...:<dxn>x<dyn>\n");
|
"-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/yuv input image\n");
|
||||||
fprintf(stdout,
|
fprintf(stdout,
|
||||||
" If subsampling is omitted, 1x1 is assumed for all components\n");
|
" 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,
|
fprintf(stdout,
|
||||||
" for raw 512x512 image with 4:2:0 subsampling\n");
|
" for raw/yuv 512x512 image with 4:2:0 subsampling\n");
|
||||||
fprintf(stdout, " Required only if RAW or RAWL input file is provided.\n");
|
fprintf(stdout, " Required only if RAW or RAWL input file is provided.\n");
|
||||||
fprintf(stdout, "\n");
|
fprintf(stdout, "\n");
|
||||||
fprintf(stdout, "Optional Parameters:\n");
|
fprintf(stdout, "Optional Parameters:\n");
|
||||||
|
@ -326,7 +326,7 @@ static void encode_help_display(void)
|
||||||
JPWL_MAX_NO_TILESPECS);
|
JPWL_MAX_NO_TILESPECS);
|
||||||
fprintf(stdout,
|
fprintf(stdout,
|
||||||
" p selects the packet error protection (EEP/UEP with EPBs)\n");
|
" 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/yuv data: 'type' can be\n");
|
||||||
fprintf(stdout,
|
fprintf(stdout,
|
||||||
" [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]\n");
|
" [0=none 1,absent=predefined 16=CRC-16 32=CRC-32 37-128=RS]\n");
|
||||||
fprintf(stdout,
|
fprintf(stdout,
|
||||||
|
@ -516,10 +516,10 @@ static int get_file_format(char *filename)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
static const char *extension[] = {
|
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[] = {
|
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, '.');
|
char * ext = strrchr(filename, '.');
|
||||||
if (ext == NULL) {
|
if (ext == NULL) {
|
||||||
|
@ -638,7 +638,7 @@ static int parse_cmdline_encoder(int argc, char **argv,
|
||||||
default:
|
default:
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"[ERROR] Unknown input file format: %s \n"
|
"[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);
|
infile);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -792,15 +792,15 @@ static int parse_cmdline_encoder(int argc, char **argv,
|
||||||
}
|
}
|
||||||
free(substr1);
|
free(substr1);
|
||||||
if (wrong) {
|
if (wrong) {
|
||||||
fprintf(stderr, "\nError: invalid raw image parameters\n");
|
fprintf(stderr, "\nError: invalid raw/yuv image parameters\n");
|
||||||
fprintf(stderr, "Please use the Format option -F:\n");
|
fprintf(stderr, "Please use the Format option -F:\n");
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"-F <width>,<height>,<ncomp>,<bitdepth>,{s,u}@<dx1>x<dy1>:...:<dxn>x<dyn>\n");
|
"-F <width>,<height>,<ncomp>,<bitdepth>,{s,u}@<dx1>x<dy1>:...:<dxn>x<dyn>\n");
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"If subsampling is omitted, 1x1 is assumed for all components\n");
|
"If subsampling is omitted, 1x1 is assumed for all components\n");
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"Example: -i image.raw -o image.j2k -F 512,512,3,8,u@1x1:2x2:2x2\n");
|
"Example: -i image.raw/yuv -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/yuv 512x512 image with 4:2:0 subsampling\n");
|
||||||
fprintf(stderr, "Aborting.\n");
|
fprintf(stderr, "Aborting.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -1732,9 +1732,9 @@ static int parse_cmdline_encoder(int argc, char **argv,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((parameters->decod_format == RAW_DFMT && raw_cp->rawWidth == 0)
|
if ((parameters->decod_format == RAW_DFMT || parameters->decod_format == RAWL_DFMT)
|
||||||
|| (parameters->decod_format == RAWL_DFMT && raw_cp->rawWidth == 0)) {
|
&& (raw_cp->rawWidth == 0)) {
|
||||||
fprintf(stderr, "[ERROR] invalid raw image parameters\n");
|
fprintf(stderr, "[ERROR] invalid raw/yuv image parameters\n");
|
||||||
fprintf(stderr, "Please use the Format option -F:\n");
|
fprintf(stderr, "Please use the Format option -F:\n");
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
|
"-F rawWidth,rawHeight,rawComp,rawBitDepth,s/u (Signed/Unsigned)\n");
|
||||||
|
@ -1947,18 +1947,12 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
switch (parameters.decod_format) {
|
switch (parameters.decod_format) {
|
||||||
case PGX_DFMT:
|
case PGX_DFMT:
|
||||||
break;
|
|
||||||
case PXM_DFMT:
|
case PXM_DFMT:
|
||||||
break;
|
|
||||||
case BMP_DFMT:
|
case BMP_DFMT:
|
||||||
break;
|
|
||||||
case TIF_DFMT:
|
case TIF_DFMT:
|
||||||
break;
|
|
||||||
case RAW_DFMT:
|
case RAW_DFMT:
|
||||||
case RAWL_DFMT:
|
case RAWL_DFMT:
|
||||||
break;
|
|
||||||
case TGA_DFMT:
|
case TGA_DFMT:
|
||||||
break;
|
|
||||||
case PNG_DFMT:
|
case PNG_DFMT:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -2001,7 +1995,7 @@ int main(int argc, char **argv)
|
||||||
case TIF_DFMT:
|
case TIF_DFMT:
|
||||||
image = tiftoimage(parameters.infile, ¶meters);
|
image = tiftoimage(parameters.infile, ¶meters);
|
||||||
if (!image) {
|
if (!image) {
|
||||||
fprintf(stderr, "Unable to load tiff file\n");
|
fprintf(stderr, "Unable to load tif(f) file\n");
|
||||||
ret = 1;
|
ret = 1;
|
||||||
goto fin;
|
goto fin;
|
||||||
}
|
}
|
||||||
|
@ -2011,7 +2005,7 @@ int main(int argc, char **argv)
|
||||||
case RAW_DFMT:
|
case RAW_DFMT:
|
||||||
image = rawtoimage(parameters.infile, ¶meters, &raw_cp);
|
image = rawtoimage(parameters.infile, ¶meters, &raw_cp);
|
||||||
if (!image) {
|
if (!image) {
|
||||||
fprintf(stderr, "Unable to load raw file\n");
|
fprintf(stderr, "Unable to load raw/yuv file\n");
|
||||||
ret = 1;
|
ret = 1;
|
||||||
goto fin;
|
goto fin;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue