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

Move per-format flag assignments to the actual TurboJPEG function calls

Browse Source
This commit is contained in:
DRC
2011-03-02 10:30:29 +00:00
parent 086cc1e5cc
commit 5e9c5f9ff7
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
jpegut.c
View File

@@ -346,13 +346,14 @@ void gentestjpeg(tjhandle hnd, unsigned char *jpegbuf, unsigned long *size,
t=rrtime(); t=rrtime();
if(yuv==YUVENCODE) if(yuv==YUVENCODE)
{ {
_catch(tjEncodeYUV(hnd, bmpbuf, w, 0, h, ps, jpegbuf, subsamp, flags)); _catch(tjEncodeYUV(hnd, bmpbuf, w, 0, h, ps, jpegbuf, subsamp,
flags|_flags[pf]));
*size=TJBUFSIZEYUV(w, h, subsamp); *size=TJBUFSIZEYUV(w, h, subsamp);
} }
else else
{ {
_catch(tjCompress(hnd, bmpbuf, w, 0, h, ps, jpegbuf, size, subsamp, qual, _catch(tjCompress(hnd, bmpbuf, w, 0, h, ps, jpegbuf, size, subsamp, qual,
flags)); flags|_flags[pf]));
} }
t=rrtime()-t; t=rrtime()-t;
@@ -417,12 +418,13 @@ void _gentestbmp(tjhandle hnd, unsigned char *jpegbuf, unsigned long jpegsize,
t=rrtime(); t=rrtime();
if(yuv==YUVDECODE) if(yuv==YUVDECODE)
{ {
_catch(tjDecompressToYUV(hnd, jpegbuf, jpegsize, bmpbuf, flags)); _catch(tjDecompressToYUV(hnd, jpegbuf, jpegsize, bmpbuf,
flags|_flags[pf]));
} }
else else
{ {
_catch(tjDecompress(hnd, jpegbuf, jpegsize, bmpbuf, scaledw, 0, scaledh, _catch(tjDecompress(hnd, jpegbuf, jpegsize, bmpbuf, scaledw, 0, scaledh,
ps, flags)); ps, flags|_flags[pf]));
} }
t=rrtime()-t; t=rrtime()-t;
@@ -497,9 +499,8 @@ void dotest(int w, int h, const int *formats, int nformats, int subsamp,
} }
pf=formats[pfi]; pf=formats[pfi];
gentestjpeg(hnd, jpegbuf, &size, w, h, pf, basefilename, subsamp, 100, gentestjpeg(hnd, jpegbuf, &size, w, h, pf, basefilename, subsamp, 100,
flags|_flags[pf]); flags);
gentestbmp(dhnd, jpegbuf, size, w, h, pf, basefilename, subsamp, gentestbmp(dhnd, jpegbuf, size, w, h, pf, basefilename, subsamp, flags);
flags|_flags[pf]);
} }
} }