ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement a YUV decode function in the TurboJPEG API, to be symmetric with tjEncodeYUV().

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1132 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2014-02-28 09:17:14 +00:00
parent 9649c114e6
commit fc300f03f9
9 changed files with 454 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

241
tjunittest.c
View File

@@ -80,7 +80,7 @@ const int _onlyGray[]={TJPF_GRAY};
const int _onlyRGB[]={TJPF_RGB};
enum {YUVENCODE=1, YUVDECODE};
int yuv=0, alloc=0, pad=4;
int doyuv=0, alloc=0, pad=4;
int exitStatus=0;
#define bailout() {exitStatus=-1; goto bailout;}
@@ -295,60 +295,6 @@ int checkBuf(unsigned char *buf, int w, int h, int pf, int subsamp,
#define PAD(v, p) ((v+(p)-1)&(~((p)-1)))
void initBufYUV(unsigned char *buf, int w, int pad, int h, int subsamp)
{
int row, col;
int hsf=tjMCUWidth[subsamp]/8, vsf=tjMCUHeight[subsamp]/8;
int pw=PAD(w, hsf), ph=PAD(h, vsf);
int cw=pw/hsf, ch=ph/vsf;
int ypitch=PAD(pw, pad), uvpitch=PAD(cw, pad);
int halfway=16, blocksize=8;
memset(buf, 0, tjBufSizeYUV2(w, pad, h, subsamp));
for(row=0; row<ph; row++)
{
for(col=0; col<pw; col++)
{
unsigned char *y=&buf[ypitch*row+col];
if(((row/blocksize)+(col/blocksize))%2==0)
{
if(row<halfway) *y=255; else *y=0;
}
else
{
if(row<halfway) *y=76; else *y=226;
}
}
}
if(subsamp!=TJSAMP_GRAY)
{
halfway=16/vsf;
for(row=0; row<ch; row++)
{
for(col=0; col<cw; col++)
{
unsigned char *u=&buf[ypitch*ph + (uvpitch*row+col)],
*v=&buf[ypitch*ph + uvpitch*ch + (uvpitch*row+col)];
if(((row*vsf/blocksize)+(col*hsf/blocksize))%2==0)
*u=*v=128;
else
{
if(row<halfway)
{
*u=85; *v=255;
}
else
{
*u=0; *v=149;
}
}
}
}
}
}
int checkBufYUV(unsigned char *buf, int w, int h, int subsamp,
tjscalingfactor sf)
{
@@ -451,71 +397,56 @@ void compTest(tjhandle handle, unsigned char **dstBuf,
unsigned long *dstSize, int w, int h, int pf, char *basename,
int subsamp, int jpegQual, int flags)
{
char tempStr[1024]; unsigned char *srcBuf=NULL;
const char *pfStr=(yuv==YUVDECODE)? "YUV":pixFormatStr[pf];
char tempStr[1024]; unsigned char *srcBuf=NULL, *yuvBuf=NULL;
const char *pfStr=pixFormatStr[pf];
const char *buStrLong=(flags&TJFLAG_BOTTOMUP)? "Bottom-Up":"Top-Down ";
const char *buStr=(flags&TJFLAG_BOTTOMUP)? "BU":"TD";
if(yuv==YUVDECODE)
{
printf("YUV %s %s -> JPEG Q%d ... ", subNameLong[subsamp], buStrLong,
jpegQual);
if((srcBuf=(unsigned char *)malloc(tjBufSizeYUV2(w, pad, h, subsamp)))
==NULL)
_throw("Memory allocation failure");
initBufYUV(srcBuf, w, pad, h, subsamp);
}
else
{
if(yuv==YUVENCODE)
printf("%s %s -> %s YUV ... ", pfStr, buStrLong, subNameLong[subsamp]);
else
printf("%s %s -> %s Q%d ... ", pfStr, buStrLong, subNameLong[subsamp],
jpegQual);
if((srcBuf=(unsigned char *)malloc(w*h*tjPixelSize[pf]))==NULL)
_throw("Memory allocation failure");
initBuf(srcBuf, w, h, pf, flags);
}
if((srcBuf=(unsigned char *)malloc(w*h*tjPixelSize[pf]))==NULL)
_throw("Memory allocation failure");
initBuf(srcBuf, w, h, pf, flags);
if(*dstBuf && *dstSize>0) memset(*dstBuf, 0, *dstSize);
if(yuv==YUVENCODE)
{
_tj(tjEncodeYUV3(handle, srcBuf, w, 0, h, pf, *dstBuf, pad, subsamp,
flags));
}
else
{
if(!alloc) flags|=TJFLAG_NOREALLOC;
if(yuv==YUVDECODE)
{
_tj(tjCompressFromYUV(handle, srcBuf, w, pad, h, subsamp, dstBuf,
dstSize, jpegQual, flags));
}
else
{
_tj(tjCompress2(handle, srcBuf, w, 0, h, pf, dstBuf, dstSize, subsamp,
jpegQual, flags));
}
}
if(yuv==YUVENCODE)
if(!alloc) flags|=TJFLAG_NOREALLOC;
if(doyuv)
{
unsigned long yuvSize=tjBufSizeYUV2(w, pad, h, subsamp);
tjscalingfactor sf={1, 1};
if((yuvBuf=(unsigned char *)malloc(yuvSize))==NULL)
_throw("Memory allocation failure");
printf("%s %s -> YUV %s ... ", pfStr, buStrLong, subNameLong[subsamp]);
_tj(tjEncodeYUV3(handle, srcBuf, w, 0, h, pf, yuvBuf, pad, subsamp,
flags));
snprintf(tempStr, 1024, "%s_enc_%s_%s_%s.yuv", basename, pfStr, buStr,
subName[subsamp]);
else
snprintf(tempStr, 1024, "%s_enc_%s_%s_%s_Q%d.jpg", basename, pfStr, buStr,
subName[subsamp], jpegQual);
writeJPEG(*dstBuf, *dstSize, tempStr);
if(yuv==YUVENCODE)
{
tjscalingfactor sf={1, 1};
if(checkBufYUV(*dstBuf, w, h, subsamp, sf)) printf("Passed.");
else printf("FAILED!");
writeJPEG(yuvBuf, yuvSize, tempStr);
if(checkBufYUV(yuvBuf, w, h, subsamp, sf)) printf("Passed.\n");
else printf("FAILED!\n");
printf("YUV %s %s -> JPEG Q%d ... ", subNameLong[subsamp], buStrLong,
jpegQual);
_tj(tjCompressFromYUV(handle, yuvBuf, w, pad, h, subsamp, dstBuf,
dstSize, jpegQual, flags));
}
else printf("Done.");
printf("\n Result in %s\n", tempStr);
else
{
printf("%s %s -> %s Q%d ... ", pfStr, buStrLong, subNameLong[subsamp],
jpegQual);
_tj(tjCompress2(handle, srcBuf, w, 0, h, pf, dstBuf, dstSize, subsamp,
jpegQual, flags));
}
snprintf(tempStr, 1024, "%s_enc_%s_%s_%s_Q%d.jpg", basename, pfStr, buStr,
subName[subsamp], jpegQual);
writeJPEG(*dstBuf, *dstSize, tempStr);
printf("Done.\n Result in %s\n", tempStr);
bailout:
if(yuvBuf) free(yuvBuf);
if(srcBuf) free(srcBuf);
}
@@ -524,61 +455,63 @@ void _decompTest(tjhandle handle, unsigned char *jpegBuf,
unsigned long jpegSize, int w, int h, int pf, char *basename, int subsamp,
int flags, tjscalingfactor sf)
{
unsigned char *dstBuf=NULL;
unsigned char *dstBuf=NULL, *yuvBuf=NULL;
int _hdrw=0, _hdrh=0, _hdrsubsamp=-1;
int scaledWidth=TJSCALED(w, sf);
int scaledHeight=TJSCALED(h, sf);
unsigned long dstSize=0;
if(yuv==YUVENCODE) return;
if(yuv==YUVDECODE)
printf("JPEG -> YUV %s ", subNameLong[subsamp]);
else
printf("JPEG -> %s %s ", pixFormatStr[pf],
(flags&TJFLAG_BOTTOMUP)? "Bottom-Up":"Top-Down ");
if(sf.num!=1 || sf.denom!=1)
printf("%d/%d ... ", sf.num, sf.denom);
else printf("... ");
_tj(tjDecompressHeader2(handle, jpegBuf, jpegSize, &_hdrw, &_hdrh,
&_hdrsubsamp));
if(_hdrw!=w || _hdrh!=h || _hdrsubsamp!=subsamp)
_throw("Incorrect JPEG header");
if(yuv==YUVDECODE)
dstSize=tjBufSizeYUV2(scaledWidth, pad, scaledHeight, subsamp);
else dstSize=scaledWidth*scaledHeight*tjPixelSize[pf];
dstSize=scaledWidth*scaledHeight*tjPixelSize[pf];
if((dstBuf=(unsigned char *)malloc(dstSize))==NULL)
_throw("Memory allocation failure");
memset(dstBuf, 0, dstSize);
if(yuv==YUVDECODE)
if(doyuv)
{
_tj(tjDecompressToYUV2(handle, jpegBuf, jpegSize, dstBuf, scaledWidth,
unsigned long yuvSize=tjBufSizeYUV2(scaledWidth, pad, scaledHeight,
subsamp);
if((yuvBuf=(unsigned char *)malloc(yuvSize))==NULL)
_throw("Memory allocation failure");
printf("JPEG -> YUV %s ", subNameLong[subsamp]);
if(sf.num!=1 || sf.denom!=1)
printf("%d/%d ... ", sf.num, sf.denom);
else printf("... ");
_tj(tjDecompressToYUV2(handle, jpegBuf, jpegSize, yuvBuf, scaledWidth,
pad, scaledHeight, flags));
if(checkBufYUV(yuvBuf, scaledWidth, scaledHeight, subsamp, sf))
printf("Passed.\n");
else printf("FAILED!\n");
printf("YUV %s -> %s %s ... ", subNameLong[subsamp], pixFormatStr[pf],
(flags&TJFLAG_BOTTOMUP)? "Bottom-Up":"Top-Down ");
_tj(tjDecodeYUV(handle, yuvBuf, pad, subsamp, dstBuf, scaledWidth, 0,
scaledHeight, pf, flags));
}
else
{
printf("JPEG -> %s %s ", pixFormatStr[pf],
(flags&TJFLAG_BOTTOMUP)? "Bottom-Up":"Top-Down ");
if(sf.num!=1 || sf.denom!=1)
printf("%d/%d ... ", sf.num, sf.denom);
else printf("... ");
_tj(tjDecompress2(handle, jpegBuf, jpegSize, dstBuf, scaledWidth, 0,
scaledHeight, pf, flags));
}
if(yuv==YUVDECODE)
{
if(checkBufYUV(dstBuf, scaledWidth, scaledHeight, subsamp, sf))
printf("Passed.");
else printf("FAILED!");
}
else
{
if(checkBuf(dstBuf, scaledWidth, scaledHeight, pf, subsamp, sf, flags))
printf("Passed.");
else printf("FAILED!");
}
if(checkBuf(dstBuf, scaledWidth, scaledHeight, pf, subsamp, sf, flags))
printf("Passed.");
else printf("FAILED!");
printf("\n");
bailout:
if(yuvBuf) free(yuvBuf);
if(dstBuf) free(dstBuf);
}
@@ -614,9 +547,7 @@ void doTest(int w, int h, const int *formats, int nformats, int subsamp,
unsigned char *dstBuf=NULL;
unsigned long size=0; int pfi, pf, i;
if(yuv==YUVENCODE)
size=tjBufSizeYUV2(w, pad, h, subsamp);
else if(!alloc)
if(!alloc)
size=tjBufSize(w, h, subsamp);
if(size!=0)
if((dstBuf=(unsigned char *)tjAlloc(size))==NULL)
@@ -633,11 +564,7 @@ void doTest(int w, int h, const int *formats, int nformats, int subsamp,
if(subsamp==TJSAMP_422 || subsamp==TJSAMP_420 || subsamp==TJSAMP_440 ||
subsamp==TJSAMP_411)
flags|=TJFLAG_FASTUPSAMPLE;
if(i==1)
{
if(yuv==YUVDECODE) goto bailout;
else flags|=TJFLAG_BOTTOMUP;
}
if(i==1) flags|=TJFLAG_BOTTOMUP;
pf=formats[pfi];
compTest(chandle, &dstBuf, &size, w, h, pf, basename, subsamp, 100,
flags);
@@ -679,9 +606,9 @@ void bufSizeTest(void)
if(h%100==0) printf("%.4d x %.4d\b\b\b\b\b\b\b\b\b\b\b", w, h);
if((srcBuf=(unsigned char *)malloc(w*h*4))==NULL)
_throw("Memory allocation failure");
if(!alloc || yuv==YUVENCODE)
if(!alloc || doyuv)
{
if(yuv==YUVENCODE) dstSize=tjBufSizeYUV2(w, pad, h, subsamp);
if(doyuv) dstSize=tjBufSizeYUV2(w, pad, h, subsamp);
else dstSize=tjBufSize(w, h, subsamp);
if((dstBuf=(unsigned char *)tjAlloc(dstSize))==NULL)
_throw("Memory allocation failure");
@@ -693,7 +620,7 @@ void bufSizeTest(void)
else srcBuf[i]=255;
}
if(yuv==YUVENCODE)
if(doyuv)
{
_tj(tjEncodeYUV3(handle, srcBuf, w, 0, h, TJPF_BGRX, dstBuf, pad,
subsamp, 0));
@@ -708,9 +635,9 @@ void bufSizeTest(void)
if((srcBuf=(unsigned char *)malloc(h*w*4))==NULL)
_throw("Memory allocation failure");
if(!alloc || yuv==YUVENCODE)
if(!alloc || doyuv)
{
if(yuv==YUVENCODE) dstSize=tjBufSizeYUV2(h, pad, w, subsamp);
if(doyuv) dstSize=tjBufSizeYUV2(h, pad, w, subsamp);
else dstSize=tjBufSize(h, w, subsamp);
if((dstBuf=(unsigned char *)tjAlloc(dstSize))==NULL)
_throw("Memory allocation failure");
@@ -722,7 +649,7 @@ void bufSizeTest(void)
else srcBuf[i]=255;
}
if(yuv==YUVENCODE)
if(doyuv)
{
_tj(tjEncodeYUV3(handle, srcBuf, h, 0, w, TJPF_BGRX, dstBuf, pad,
subsamp, 0));
@@ -748,7 +675,7 @@ void bufSizeTest(void)
int main(int argc, char *argv[])
{
int doyuv=0, i, num4bf=5;
int i, num4bf=5;
#ifdef _WIN32
srand((unsigned int)time(NULL));
#endif
@@ -764,7 +691,7 @@ int main(int argc, char *argv[])
}
}
if(alloc) printf("Testing automatic buffer allocation\n");
if(doyuv) {yuv=YUVENCODE; num4bf=4;}
if(doyuv) num4bf=4;
doTest(35, 39, _3byteFormats, 2, TJSAMP_444, "test");
doTest(39, 41, _4byteFormats, num4bf, TJSAMP_444, "test");
doTest(41, 35, _3byteFormats, 2, TJSAMP_422, "test");
@@ -782,21 +709,13 @@ int main(int argc, char *argv[])
if(doyuv)
{
printf("\n--------------------\n\n");
yuv=YUVDECODE;
doTest(48, 48, _onlyRGB, 1, TJSAMP_444, "test_yuv0");
doTest(35, 39, _onlyRGB, 1, TJSAMP_444, "test_yuv1");
doTest(48, 48, _onlyRGB, 1, TJSAMP_422, "test_yuv0");
doTest(39, 41, _onlyRGB, 1, TJSAMP_422, "test_yuv1");
doTest(48, 48, _onlyRGB, 1, TJSAMP_420, "test_yuv0");
doTest(41, 35, _onlyRGB, 1, TJSAMP_420, "test_yuv1");
doTest(48, 48, _onlyRGB, 1, TJSAMP_440, "test_yuv0");
doTest(35, 39, _onlyRGB, 1, TJSAMP_440, "test_yuv1");
doTest(48, 48, _onlyRGB, 1, TJSAMP_411, "test_yuv0");
doTest(39, 41, _onlyRGB, 1, TJSAMP_411, "test_yuv1");
doTest(48, 48, _onlyRGB, 1, TJSAMP_GRAY, "test_yuv0");
doTest(41, 35, _onlyRGB, 1, TJSAMP_GRAY, "test_yuv1");
doTest(48, 48, _onlyGray, 1, TJSAMP_GRAY, "test_yuv0");
doTest(35, 39, _onlyGray, 1, TJSAMP_GRAY, "test_yuv1");
}
return exitStatus;