#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
#include <math.h>
#include <errno.h>
#include <cdjpeg.h>
#define _throwtj(m) _throw(m, tjGetErrorStr())
#define _throwbmp(m) _throw(m, bmpgeterr())
-enum {YUVENCODE=1, YUVDECODE};
-int flags=TJFLAG_NOREALLOC, decomponly=0, yuv=0, quiet=0, dotile=0,
- pf=TJPF_BGR;
+enum {YUVENCODE=1, YUVDECODE, YUVCOMPRESS};
+int flags=TJFLAG_NOREALLOC, componly=0, decomponly=0, yuv=0, quiet=0, dotile=0,
+ pf=TJPF_BGR, yuvpad=1;
char *ext="ppm";
const char *pixFormatStr[TJ_NUMPF]=
{
int row, col, i, dstbufalloc=0, retval=0;
double start, elapsed;
int ps=tjPixelSize[pf];
- int yuvsize=tjBufSizeYUV(w, h, subsamp), bufsize;
- int scaledw=(yuv==YUVDECODE)? w : TJSCALED(w, sf);
- int scaledh=(yuv==YUVDECODE)? h : TJSCALED(h, sf);
+ int scaledw=TJSCALED(w, sf);
+ int scaledh=TJSCALED(h, sf);
+ int yuvsize=tjBufSizeYUV2(scaledw, yuvpad, scaledh, subsamp), bufsize;
int pitch=scaledw*ps;
int ntilesw=(w+tilew-1)/tilew, ntilesh=(h+tileh-1)/tileh;
unsigned char *dstptr, *dstptr2;
/* Execute once to preload cache */
if(yuv==YUVDECODE)
{
- if(tjDecompressToYUV(handle, jpegbuf[0], jpegsize[0], dstbuf, flags)==-1)
- _throwtj("executing tjDecompressToYUV()");
+ if(tjDecompressToYUV2(handle, jpegbuf[0], jpegsize[0], dstbuf, scaledw,
+ yuvpad, scaledh, flags)==-1)
+ _throwtj("executing tjDecompressToYUV2()");
}
else if(tjDecompress2(handle, jpegbuf[0], jpegsize[0], dstbuf, scaledw,
pitch, scaledh, pf, flags)==-1)
int tile=0;
if(yuv==YUVDECODE)
{
- if(tjDecompressToYUV(handle, jpegbuf[0], jpegsize[0], dstbuf, flags)==-1)
- _throwtj("executing tjDecompressToYUV()");
+ if(tjDecompressToYUV2(handle, jpegbuf[0], jpegsize[0], dstbuf, scaledw,
+ yuvpad, scaledh, flags)==-1)
+ _throwtj("executing tjDecompressToYUV2()");
}
else for(row=0, dstptr=dstbuf; row<ntilesh; row++, dstptr+=pitch*tileh)
{
printf(" Dest. throughput: %f Megapixels/sec\n",
(double)(w*h)/1000000.*(double)i/elapsed);
}
+ if(sf.num!=1 || sf.denom!=1)
+ snprintf(sizestr, 20, "%d_%d", sf.num, sf.denom);
+ else if(tilew!=w || tileh!=h)
+ snprintf(sizestr, 20, "%dx%d", tilew, tileh);
+ else snprintf(sizestr, 20, "full");
+ if(decomponly)
+ snprintf(tempstr, 1024, "%s_%s.%s", filename, sizestr, ext);
+ else
+ snprintf(tempstr, 1024, "%s_%s%s_%s.%s", filename, subName[subsamp],
+ qualstr, sizestr, ext);
+
if(yuv==YUVDECODE)
{
- snprintf(tempstr, 1024, "%s_%s%s.yuv", filename, subName[subsamp],
- qualstr);
if((file=fopen(tempstr, "wb"))==NULL)
_throwunix("opening YUV image for output");
if(fwrite(dstbuf, yuvsize, 1, file)!=1)
}
else
{
- if(sf.num!=1 || sf.denom!=1)
- snprintf(sizestr, 20, "%d_%d", sf.num, sf.denom);
- else if(tilew!=w || tileh!=h)
- snprintf(sizestr, 20, "%dx%d", tilew, tileh);
- else snprintf(sizestr, 20, "full");
- if(decomponly)
- snprintf(tempstr, 1024, "%s_%s.%s", filename, sizestr, ext);
- else
- snprintf(tempstr, 1024, "%s_%s%s_%s.%s", filename, subName[subsamp],
- qualstr, sizestr, ext);
if(savebmp(tempstr, dstbuf, scaledw, scaledh, pf,
(flags&TJFLAG_BOTTOMUP)!=0)==-1)
_throwbmp("saving bitmap");
double start, elapsed;
int totaljpegsize=0, row, col, i, tilew=w, tileh=h, retval=0;
unsigned long *jpegsize=NULL;
- int ps=tjPixelSize[pf], ntilesw=1, ntilesh=1, pitch=w*ps;
+ int ps=(yuv==YUVCOMPRESS)? 3:tjPixelSize[pf];
+ int ntilesw=1, ntilesh=1, pitch=w*ps;
+ const char *pfStr=(yuv==YUVCOMPRESS)? "YUV":pixFormatStr[pf];
if(yuv==YUVENCODE) {dotestyuv(srcbuf, w, h, subsamp, filename); return;}
_throwunix("allocating temporary image buffer");
if(!quiet)
- printf(">>>>> %s (%s) <--> JPEG %s Q%d <<<<<\n", pixFormatStr[pf],
+ printf(">>>>> %s (%s) <--> JPEG %s Q%d <<<<<\n", pfStr,
(flags&TJFLAG_BOTTOMUP)? "Bottom-up":"Top-down", subNameLong[subsamp],
jpegqual);
/* Compression test */
if(quiet==1)
- printf("%s\t%s\t%s\t%d\t", pixFormatStr[pf],
- (flags&TJFLAG_BOTTOMUP)? "BU":"TD", subNameLong[subsamp], jpegqual);
- for(i=0; i<h; i++)
- memcpy(&tmpbuf[pitch*i], &srcbuf[w*ps*i], w*ps);
+ printf("%s\t%s\t%s\t%d\t", pfStr, (flags&TJFLAG_BOTTOMUP)? "BU":"TD",
+ subNameLong[subsamp], jpegqual);
+ if(yuv!=YUVCOMPRESS)
+ for(i=0; i<h; i++)
+ memcpy(&tmpbuf[pitch*i], &srcbuf[w*ps*i], w*ps);
if((handle=tjInitCompress())==NULL)
_throwtj("executing tjInitCompress()");
/* Execute once to preload cache */
- if(tjCompress2(handle, srcbuf, tilew, pitch, tileh, pf, &jpegbuf[0],
- &jpegsize[0], subsamp, jpegqual, flags)==-1)
- _throwtj("executing tjCompress2()");
+ if(yuv==YUVCOMPRESS)
+ {
+ if(tjCompressFromYUV(handle, srcbuf, tilew, yuvpad, tileh, subsamp,
+ &jpegbuf[0], &jpegsize[0], jpegqual, flags)==-1)
+ _throwtj("executing tjCompressFromYUV()");
+ }
+ else
+ {
+ if(tjCompress2(handle, srcbuf, tilew, pitch, tileh, pf, &jpegbuf[0],
+ &jpegsize[0], subsamp, jpegqual, flags)==-1)
+ _throwtj("executing tjCompress2()");
+ }
/* Benchmark */
for(i=0, start=gettime(); (elapsed=gettime()-start)<benchtime; i++)
{
int width=min(tilew, w-col*tilew);
int height=min(tileh, h-row*tileh);
- if(tjCompress2(handle, srcptr2, width, pitch, height, pf,
- &jpegbuf[tile], &jpegsize[tile], subsamp, jpegqual, flags)==-1)
- _throwtj("executing tjCompress()2");
+ if(yuv==YUVCOMPRESS)
+ {
+ if(tjCompressFromYUV(handle, srcptr2, width, yuvpad, height,
+ subsamp, &jpegbuf[tile], &jpegsize[tile], jpegqual, flags)==-1)
+ _throwtj("executing tjCompressFromYUV()");
+ }
+ else
+ {
+ if(tjCompress2(handle, srcptr2, width, pitch, height, pf,
+ &jpegbuf[tile], &jpegsize[tile], subsamp, jpegqual, flags)==-1)
+ _throwtj("executing tjCompress2()");
+ }
totaljpegsize+=jpegsize[tile];
}
}
}
/* Decompression test */
- if(decomptest(srcbuf, jpegbuf, jpegsize, tmpbuf, w, h, subsamp, jpegqual,
- filename, tilew, tileh)==-1)
- goto bailout;
+ if(!componly)
+ {
+ if(decomptest(srcbuf, jpegbuf, jpegsize, tmpbuf, w, h, subsamp, jpegqual,
+ filename, tilew, tileh)==-1)
+ goto bailout;
+ }
for(i=0; i<ntilesw*ntilesh; i++)
{
{
int i;
printf("USAGE: %s\n", progname);
- printf(" <Inputfile (BMP|PPM)> <Quality> [options]\n\n");
+ printf(" <Inputfile (BMP|PPM|YUV)> <Quality> [options]\n\n");
printf(" %s\n", progname);
printf(" <Inputfile (JPG)> [options]\n\n");
printf("Options:\n\n");
printf(" codec\n");
printf("-accuratedct = Use the most accurate DCT/IDCT algorithms available in the\n");
printf(" underlying codec\n");
- printf("-411 = Test 4:1:1 chrominance subsampling instead of 4:2:0\n");
- printf("-440 = Test 4:4:0 chrominance subsampling instead of 4:2:2\n");
+ printf("-subsamp <s> = if compressing a JPEG image from a YUV planar source image,\n");
+ printf(" this specifies the level of chrominance subsampling used in the source\n");
+ printf(" image. Otherwise, this specifies the level of chrominance subsampling\n");
+ printf(" to use in the JPEG destination image. <s> = 444, 422, 440, 420, 411,\n");
+ printf(" or GRAY\n");
printf("-quiet = Output results in tabular rather than verbose format\n");
printf("-yuvencode = Encode RGB input as planar YUV rather than compressing as JPEG\n");
printf("-yuvdecode = Decode JPEG image to planar YUV rather than RGB\n");
+ printf("-yuvsize WxH = if compressing a JPEG image from a YUV planar source image, this\n");
+ printf(" specifies the width and height of the source image.\n");
+ printf("-yuvpad <p> = if compressing a JPEG image from a YUV planar source image, this\n");
+ printf(" specifies the number of bytes to which each row of each plane in the\n");
+ printf(" source image is padded. If decompressing a JPEG image to a YUV planar\n");
+ printf(" destination image, this specifies the row padding for each plane of the\n");
+ printf(" destination image. (default=1)\n");
printf("-scale M/N = scale down the width/height of the decompressed JPEG image by a\n");
printf(" factor of M/N (M/N = ");
for(i=0; i<nsf; i++)
printf(" decompression (these options are mutually exclusive)\n");
printf("-grayscale = Perform lossless grayscale conversion prior to decompression\n");
printf(" test (can be combined with the other transforms above)\n");
- printf("-benchtime <t> = Run each benchmark for at least <t> seconds (default = 5.0)\n\n");
+ printf("-benchtime <t> = Run each benchmark for at least <t> seconds (default = 5.0)\n");
+ printf("-componly = Stop after running compression tests. Do not test decompression.\n\n");
printf("NOTE: If the quality is specified as a range (e.g. 90-100), a separate\n");
printf("test will be performed for all quality values in the range.\n\n");
exit(1);
int main(int argc, char *argv[])
{
- unsigned char *srcbuf=NULL; int w, h, i, j;
+ unsigned char *srcbuf=NULL; int w=0, h=0, i, j;
int minqual=-1, maxqual=-1; char *temp;
- int minarg=2, retval=0, do440=0, do411=0;
+ int minarg=2, retval=0, subsamp=-1;
if((scalingfactors=tjGetScalingFactors(&nsf))==NULL || nsf==0)
_throwtj("executing tjGetScalingFactors()");
{
if(!strcasecmp(temp, ".bmp")) ext="bmp";
if(!strcasecmp(temp, ".jpg") || !strcasecmp(temp, ".jpeg")) decomponly=1;
+ if(!strcasecmp(temp, ".yuv")) yuv=YUVCOMPRESS;
}
printf("\n");
printf("Using most accurate DCT/IDCT algorithm\n\n");
flags|=TJFLAG_ACCURATEDCT;
}
- if(!strcmp(argv[i], "-440")) do440=1;
if(!strcasecmp(argv[i], "-rgb")) pf=TJPF_RGB;
if(!strcasecmp(argv[i], "-rgbx")) pf=TJPF_RGBX;
if(!strcasecmp(argv[i], "-bgr")) pf=TJPF_BGR;
if(!strcmp(argv[i], "-?")) usage(argv[0]);
if(!strcasecmp(argv[i], "-alloc")) flags&=(~TJFLAG_NOREALLOC);
if(!strcasecmp(argv[i], "-bmp")) ext="bmp";
- if(!strcasecmp(argv[i], "-411")) do411=1;
+ if(!strcasecmp(argv[i], "-yuvsize") && i<argc-1)
+ {
+ int temp1=0, temp2=0;
+ if(sscanf(argv[++i], "%dx%d", &temp1, &temp2)==2 && temp1>=1
+ && temp2>=1)
+ {
+ w=temp1; h=temp2;
+ }
+ else usage(argv[0]);
+ }
+ if(!strcasecmp(argv[i], "-yuvpad") && i<argc-1)
+ {
+ int temp=atoi(argv[++i]);
+ if(temp>=1) yuvpad=temp;
+ }
+ if(!strcasecmp(argv[i], "-subsamp") && i<argc-1)
+ {
+ i++;
+ if(toupper(argv[i][0])=='G') subsamp=TJSAMP_GRAY;
+ else
+ {
+ int temp=atoi(argv[i]);
+ switch(temp)
+ {
+ case 444: subsamp=TJSAMP_444; break;
+ case 422: subsamp=TJSAMP_422; break;
+ case 440: subsamp=TJSAMP_440; break;
+ case 420: subsamp=TJSAMP_420; break;
+ case 411: subsamp=TJSAMP_411; break;
+ }
+ }
+ }
+ if(!strcasecmp(argv[i], "-componly")) componly=1;
}
}
+ if(yuv) ext="yuv";
+
if((sf.num!=1 || sf.denom!=1) && dotile)
{
printf("Disabling tiled compression/decompression tests, because those tests do not\n");
if(yuv && dotile)
{
printf("Disabling tiled compression/decompression tests, because those tests do not\n");
- printf("work when YUV encoding or decoding is enabled.\n\n");
+ printf("work when YUV encoding, compression, or decoding is enabled.\n\n");
dotile=0;
}
if(!decomponly)
{
- if(loadbmp(argv[1], &srcbuf, &w, &h, pf, (flags&TJFLAG_BOTTOMUP)!=0)==-1)
- _throwbmp("loading bitmap");
+ if(yuv==YUVCOMPRESS)
+ {
+ FILE *file=NULL; unsigned long srcsize;
+ if(w<1 || h<1 || subsamp<0 || subsamp>=TJ_NUMSAMP)
+ _throw("opening YUV image file",
+ "YUV image size and/or subsampling not specified");
+ if((file=fopen(argv[1], "rb"))==NULL)
+ _throwunix("opening YUV image file");
+ if(fseek(file, 0, SEEK_END)<0 ||
+ (srcsize=ftell(file))==(unsigned long)-1)
+ _throwunix("determining YUV image file size");
+ if(srcsize!=tjBufSizeYUV2(w, yuvpad, h, subsamp))
+ _throw("opening YUV image file", "YUV image file is the wrong size");
+ if((srcbuf=(unsigned char *)malloc(srcsize))==NULL)
+ _throwunix("allocating memory for YUV image");
+ if(fseek(file, 0, SEEK_SET)<0)
+ _throwunix("setting YUV image file position");
+ if(fread(srcbuf, srcsize, 1, file)<1)
+ _throwunix("reading YUV data");
+ fclose(file); file=NULL;
+ }
+ else
+ {
+ if(loadbmp(argv[1], &srcbuf, &w, &h, pf, (flags&TJFLAG_BOTTOMUP)!=0)==-1)
+ _throwbmp("loading bitmap");
+ }
temp=strrchr(argv[1], '.');
if(temp!=NULL) *temp='\0';
}
printf("\n");
goto bailout;
}
- for(i=maxqual; i>=minqual; i--)
- dotest(srcbuf, w, h, TJ_GRAYSCALE, i, argv[1]);
- printf("\n");
- for(i=maxqual; i>=minqual; i--)
- dotest(srcbuf, w, h, do411? TJSAMP_411:TJ_420, i, argv[1]);
- printf("\n");
- for(i=maxqual; i>=minqual; i--)
- dotest(srcbuf, w, h, do440? TJSAMP_440:TJ_422, i, argv[1]);
- printf("\n");
- for(i=maxqual; i>=minqual; i--)
- dotest(srcbuf, w, h, TJ_444, i, argv[1]);
- printf("\n");
+ if(yuv==YUVCOMPRESS || (subsamp>=0 && subsamp<TJ_NUMSAMP))
+ {
+ for(i=maxqual; i>=minqual; i--)
+ dotest(srcbuf, w, h, subsamp, i, argv[1]);
+ printf("\n");
+ }
+ else
+ {
+ for(i=maxqual; i>=minqual; i--)
+ dotest(srcbuf, w, h, TJSAMP_GRAY, i, argv[1]);
+ printf("\n");
+ for(i=maxqual; i>=minqual; i--)
+ dotest(srcbuf, w, h, TJSAMP_420, i, argv[1]);
+ printf("\n");
+ for(i=maxqual; i>=minqual; i--)
+ dotest(srcbuf, w, h, TJSAMP_422, i, argv[1]);
+ printf("\n");
+ for(i=maxqual; i>=minqual; i--)
+ dotest(srcbuf, w, h, TJSAMP_444, i, argv[1]);
+ printf("\n");
+ }
bailout:
if(srcbuf) free(srcbuf);
projects / libjpeg-turbo / commitdiff