Update libjpeg-turbo to r722.

tjbench.c

 /*
  * Copyright (C)2009-2011 D. R. Commander.  All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * - Redistributions of source code must retain the above copyright notice,
  *   this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice,
  *   this list of conditions and the following disclaimer in the documentation
@@ skipping 41 matching lines @@
 {
         "RGB", "BGR", "RGBX", "BGRX", "XBGR", "XRGB", "GRAY"
 };
 const char *subNameLong[TJ_NUMSAMP]=
 {
         "4:4:4", "4:2:2", "4:2:0", "GRAY", "4:4:0"
 };
 const char *subName[NUMSUBOPT]={"444", "422", "420", "GRAY", "440"};
 tjscalingfactor *scalingfactors=NULL, sf={1, 1};  int nsf=0;
 int xformop=TJXOP_NONE, xformopt=0;
+int (*customFilter)(short *, tjregion, tjregion, int, int, tjtransform *);
 double benchtime=5.0;
 
 
 char *sigfig(double val, int figs, char *buf, int len)
 {
         char format[80];
         int digitsafterdecimal=figs-(int)ceil(log10(fabs(val)));
         if(digitsafterdecimal<1) snprintf(format, 80, "%%.0f");
         else snprintf(format, 80, "%%.%df", digitsafterdecimal);
         snprintf(buf, len, format, val);
         return buf;
 }
 
 
+/* Custom DCT filter which produces a negative of the image */
+int dummyDCTFilter(short *coeffs, tjregion arrayRegion, tjregion planeRegion,
+        int componentIndex, int transformIndex, tjtransform *transform)
+{
+        int i;
+        for(i=0; i<arrayRegion.w*arrayRegion.h; i++) coeffs[i]=-coeffs[i];
+        return 0;
+}
+
+
 /* Decompression test */
 int decomptest(unsigned char *srcbuf, unsigned char **jpegbuf,
         unsigned long *jpegsize, unsigned char *dstbuf, int w, int h,
         int subsamp, int jpegqual, char *filename, int tilew, int tileh)
 {
         char tempstr[1024], sizestr[20]="\0", qualstr[6]="\0", *ptr;
         FILE *file=NULL;  tjhandle handle=NULL;
         int row, col, i, dstbufalloc=0, retval=0;
         double start, elapsed;
         int ps=tjPixelSize[pf];
@@ skipping 365 matching lines @@
 
 void dodecomptest(char *filename)
 {
         FILE *file=NULL;  tjhandle handle=NULL;
         unsigned char **jpegbuf=NULL, *srcbuf=NULL;
         unsigned long *jpegsize=NULL, srcsize, totaljpegsize;
         tjtransform *t=NULL;
         int w=0, h=0, subsamp=-1, _w, _h, _tilew, _tileh,
                 _ntilesw, _ntilesh, _subsamp;
         char *temp=NULL, tempstr[80], tempstr2[80];
-        int row, col, i, tilew, tileh, ntilesw, ntilesh, retval=0;
+        int row, col, i, tilew, tileh, ntilesw=1, ntilesh=1, retval=0;
         double start, elapsed;
         int ps=tjPixelSize[pf], tile;
 
         if((file=fopen(filename, "rb"))==NULL)
                 _throwunix("opening file");
         if(fseek(file, 0, SEEK_END)<0 || (srcsize=ftell(file))<0)
                 _throwunix("determining file size");
         if((srcbuf=(unsigned char *)malloc(srcsize))==NULL)
                 _throwunix("allocating memory");
         if(fseek(file, 0, SEEK_SET)<0)
@@ skipping 55 matching lines @@
                         printf("\n");
                 }
                 else if(quiet==1)
                 {
                         printf("%s\t%s\t%s\t", pixFormatStr[pf],
                                 (flags&TJFLAG_BOTTOMUP)? "BU":"TD", subNameLong[subsamp]);
                         printf("%-4d  %-4d\t", tilew, tileh);
                 }
 
                 _subsamp=subsamp;
-                if(dotile || xformop!=TJXOP_NONE || xformopt!=0)
+                if(dotile || xformop!=TJXOP_NONE || xformopt!=0 || customFilter)
                 {
                         if((t=(tjtransform *)malloc(sizeof(tjtransform)*ntilesw*ntilesh))
                                 ==NULL)
                                 _throwunix("allocating image transform array");
 
                         if(xformop==TJXOP_TRANSPOSE || xformop==TJXOP_TRANSVERSE
                                 || xformop==TJXOP_ROT90 || xformop==TJXOP_ROT270)
                         {
                                 _w=h;  _h=w;  _tilew=tileh;  _tileh=tilew;
                         }
@@ skipping 13 matching lines @@
                         for(row=0, tile=0; row<_ntilesh; row++)
                         {
                                 for(col=0; col<_ntilesw; col++, tile++)
                                 {
                                         t[tile].r.w=min(_tilew, _w-col*_tilew);
                                         t[tile].r.h=min(_tileh, _h-row*_tileh);
                                         t[tile].r.x=col*_tilew;
                                         t[tile].r.y=row*_tileh;
                                         t[tile].op=xformop;
                                         t[tile].options=xformopt|TJXOPT_TRIM;
+                                        t[tile].customFilter=customFilter;
+                                        if(t[tile].options&TJXOPT_NOOUTPUT && jpegbuf[tile])
+                                        {
+                                                free(jpegbuf[tile]);  jpegbuf[tile]=NULL;
+                                        }
                                 }
                         }
 
                         start=gettime();
                         if(tjTransform(handle, srcbuf, srcsize, _ntilesw*_ntilesh, jpegbuf,
                                 jpegsize, t, flags)==-1)
                                 _throwtj("executing tjTransform()");
                         elapsed=gettime()-start;
 
                         free(t);  t=NULL;
@@ skipping 23 matching lines @@
                 }
                 else
                 {
                         if(quiet==1) printf("N/A\tN/A\t");
                         jpegsize[0]=srcsize;
                         memcpy(jpegbuf[0], srcbuf, srcsize);
                 }
 
                 if(w==tilew) _tilew=_w;
                 if(h==tileh) _tileh=_h;
-                if(decomptest(NULL, jpegbuf, jpegsize, NULL, _w, _h, _subsamp, 0,
-                        filename, _tilew, _tileh)==-1)
-                        goto bailout;
+                if(!(xformopt&TJXOPT_NOOUTPUT))
+                {
+                        if(decomptest(NULL, jpegbuf, jpegsize, NULL, _w, _h, _subsamp, 0,
+                                filename, _tilew, _tileh)==-1)
+                                goto bailout;
+                }
+                else if(quiet==1) printf("N/A\n");
 
                 for(i=0; i<ntilesw*ntilesh; i++)
                 {
                         free(jpegbuf[i]);  jpegbuf[i]=NULL;
                 }
                 free(jpegbuf);  jpegbuf=NULL;
                 if(jpegsize) {free(jpegsize);  jpegsize=NULL;}
 
                 if(tilew==w && tileh==h) break;
         }
@@ skipping 175 matching lines @@
                                 else usage(argv[0]);
                         }
                         if(!strcasecmp(argv[i], "-hflip")) xformop=TJXOP_HFLIP;
                         if(!strcasecmp(argv[i], "-vflip")) xformop=TJXOP_VFLIP;
                         if(!strcasecmp(argv[i], "-transpose")) xformop=TJXOP_TRANSPOSE;
                         if(!strcasecmp(argv[i], "-transverse")) xformop=TJXOP_TRANSVERSE;
                         if(!strcasecmp(argv[i], "-rot90")) xformop=TJXOP_ROT90;
                         if(!strcasecmp(argv[i], "-rot180")) xformop=TJXOP_ROT180;
                         if(!strcasecmp(argv[i], "-rot270")) xformop=TJXOP_ROT270;
                         if(!strcasecmp(argv[i], "-grayscale")) xformopt|=TJXOPT_GRAY;
+                        if(!strcasecmp(argv[i], "-custom")) customFilter=dummyDCTFilter;
+                        if(!strcasecmp(argv[i], "-nooutput")) xformopt|=TJXOPT_NOOUTPUT;
                         if(!strcasecmp(argv[i], "-benchtime") && i<argc-1)
                         {
                                 double temp=atof(argv[++i]);
                                 if(temp>0.0) benchtime=temp;
                                 else usage(argv[0]);
                         }
                         if(!strcmp(argv[i], "-?")) usage(argv[0]);
                         if(!strcasecmp(argv[i], "-alloc")) flags&=(~TJFLAG_NOREALLOC);
                         if(!strcasecmp(argv[i], "-bmp")) ext="bmp";
                 }
@@ skipping 45 matching lines @@
                 dotest(srcbuf, w, h, TJ_422, i, argv[1]);
         printf("\n");
         for(i=maxqual; i>=minqual; i--)
                 dotest(srcbuf, w, h, TJ_444, i, argv[1]);
         printf("\n");
 
         bailout:
         if(srcbuf) free(srcbuf);
         return retval;
 }