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

tj3Transform: Don't calc dst subsamp unless needed

Browse Source 
This just improves code readability by emphasizing that we don't care
about the destination image's level of subsampling unless
TJPARAM_NOREALLOC is set or lossless cropping will be performed.
This commit is contained in:
DRC
2024-09-14 10:29:56 -04:00
parent bcbca8b9bc
commit f29eda6485
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
turbojpeg.c
View File

@@ -2738,6 +2738,10 @@ DLLEXPORT int tj3Transform(tjhandle handle, const unsigned char *jpegBuf,
srcSubsamp = getSubsamp(&this->dinfo); srcSubsamp = getSubsamp(&this->dinfo);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (!jtransform_request_workspace(dinfo, &xinfo[i]))
THROW("Transform is not perfect");
if (xinfo[i].crop) {
int dstSubsamp = (t[i].options & TJXOPT_GRAY) ? TJSAMP_GRAY : srcSubsamp; int dstSubsamp = (t[i].options & TJXOPT_GRAY) ? TJSAMP_GRAY : srcSubsamp;
if (t[i].op == TJXOP_TRANSPOSE || t[i].op == TJXOP_TRANSVERSE || if (t[i].op == TJXOP_TRANSPOSE || t[i].op == TJXOP_TRANSVERSE ||
@@ -2747,13 +2751,8 @@ DLLEXPORT int tj3Transform(tjhandle handle, const unsigned char *jpegBuf,
else if (dstSubsamp == TJSAMP_411) dstSubsamp = TJSAMP_441; else if (dstSubsamp == TJSAMP_411) dstSubsamp = TJSAMP_441;
else if (dstSubsamp == TJSAMP_441) dstSubsamp = TJSAMP_411; else if (dstSubsamp == TJSAMP_441) dstSubsamp = TJSAMP_411;
} }
if (!jtransform_request_workspace(dinfo, &xinfo[i]))
THROW("Transform is not perfect");
if (xinfo[i].crop) {
if (dstSubsamp == TJSAMP_UNKNOWN) if (dstSubsamp == TJSAMP_UNKNOWN)
THROW("Could not determine subsampling level of JPEG image"); THROW("Could not determine subsampling level of destination image");
if ((t[i].r.x % tjMCUWidth[dstSubsamp]) != 0 || if ((t[i].r.x % tjMCUWidth[dstSubsamp]) != 0 ||
(t[i].r.y % tjMCUHeight[dstSubsamp]) != 0) (t[i].r.y % tjMCUHeight[dstSubsamp]) != 0)
THROWI("To crop this JPEG image, x must be a multiple of %d\n" THROWI("To crop this JPEG image, x must be a multiple of %d\n"
@@ -2766,15 +2765,10 @@ DLLEXPORT int tj3Transform(tjhandle handle, const unsigned char *jpegBuf,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
JDIMENSION dstWidth = dinfo->image_width, dstHeight = dinfo->image_height; JDIMENSION dstWidth = dinfo->image_width, dstHeight = dinfo->image_height;
int dstSubsamp = (t[i].options & TJXOPT_GRAY) ? TJSAMP_GRAY : srcSubsamp;
if (t[i].op == TJXOP_TRANSPOSE || t[i].op == TJXOP_TRANSVERSE || if (t[i].op == TJXOP_TRANSPOSE || t[i].op == TJXOP_TRANSVERSE ||
t[i].op == TJXOP_ROT90 || t[i].op == TJXOP_ROT270) { t[i].op == TJXOP_ROT90 || t[i].op == TJXOP_ROT270) {
dstWidth = dinfo->image_height; dstHeight = dinfo->image_width; dstWidth = dinfo->image_height; dstHeight = dinfo->image_width;
if (dstSubsamp == TJSAMP_422) dstSubsamp = TJSAMP_440;
else if (dstSubsamp == TJSAMP_440) dstSubsamp = TJSAMP_422;
else if (dstSubsamp == TJSAMP_411) dstSubsamp = TJSAMP_441;
else if (dstSubsamp == TJSAMP_441) dstSubsamp = TJSAMP_411;
} }
if (xinfo[i].crop) { if (xinfo[i].crop) {
@@ -2786,6 +2780,17 @@ DLLEXPORT int tj3Transform(tjhandle handle, const unsigned char *jpegBuf,
dstWidth = xinfo[i].crop_width; dstHeight = xinfo[i].crop_height; dstWidth = xinfo[i].crop_width; dstHeight = xinfo[i].crop_height;
} }
if (this->noRealloc) { if (this->noRealloc) {
int dstSubsamp = (t[i].options & TJXOPT_GRAY) ? TJSAMP_GRAY : srcSubsamp;
if (t[i].op == TJXOP_TRANSPOSE || t[i].op == TJXOP_TRANSVERSE ||
t[i].op == TJXOP_ROT90 || t[i].op == TJXOP_ROT270) {
if (dstSubsamp == TJSAMP_422) dstSubsamp = TJSAMP_440;
else if (dstSubsamp == TJSAMP_440) dstSubsamp = TJSAMP_422;
else if (dstSubsamp == TJSAMP_411) dstSubsamp = TJSAMP_441;
else if (dstSubsamp == TJSAMP_441) dstSubsamp = TJSAMP_411;
}
if (dstSubsamp == TJSAMP_UNKNOWN)
THROW("Could not determine subsampling level of destination image");
alloc = FALSE; alloc = FALSE;
dstSizes[i] = tj3JPEGBufSize(dstWidth, dstHeight, dstSubsamp); dstSizes[i] = tj3JPEGBufSize(dstWidth, dstHeight, dstSubsamp);
} }