License under GPLv2.

[qscale] / qscale.c

diff --git a/qscale.c b/qscale.c
index ee70208c28e5307511324c73f6a3800084cb6ad8..ca7c7dd16152fac40c672e35898ea4450ec680a4 100644 (file)
--- a/qscale.c
+++ b/qscale.c
@@ -1,3 +1,21 @@
+/*
+ * qscale: Quick, high-quality JPEG-to-JPEG scaler.
+ * Copyright (C) 2008 Steinar H. Gunderson <sgunderson@bigfoot.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 #include <stdio.h>
 #include <malloc.h>
 #include <math.h>
@@ -336,13 +354,27 @@ void vscale(unsigned char *pix, float *npix, unsigned w, unsigned h, unsigned nh
 
 int main(int argc, char **argv)
 {
+       /* user-settable parameters */
        unsigned nominal_w = atoi(argv[1]);
        unsigned nominal_h = atoi(argv[2]);
-
        unsigned samp_h0 = 2, samp_v0 = 2;
        unsigned samp_h1 = 1, samp_v1 = 1;
        unsigned samp_h2 = 1, samp_v2 = 1;
-       unsigned max_samp_h = 2, max_samp_v = 2;
+       unsigned jpeg_quality = 85;
+       /* end */
+
+       unsigned max_samp_h, max_samp_v;
+       max_samp_h = samp_h0;
+       if (samp_h1 > max_samp_h)
+               max_samp_h = samp_h1;
+       if (samp_h2 > max_samp_h)
+               max_samp_h = samp_h2;
+       
+       max_samp_v = samp_v0;
+       if (samp_v1 > max_samp_v)
+               max_samp_v = samp_v1;
+       if (samp_v2 > max_samp_v)
+               max_samp_v = samp_v2;
 
        unsigned nw0 = nominal_w * samp_h0 / max_samp_h, nh0 = nominal_h * samp_v0 / max_samp_v;
        unsigned nw1 = nominal_w * samp_h1 / max_samp_h, nh1 = nominal_h * samp_v1 / max_samp_v;
@@ -406,21 +438,21 @@ int main(int argc, char **argv)
        {
                float *npix = (float*)memalign(16, dinfo.comp_info[0].width_in_blocks * DCTSIZE * nh0 * sizeof(float)); 
                vscale(data_y, npix, dinfo.comp_info[0].width_in_blocks * DCTSIZE, h0, nh0, dinfo.comp_info[0].width_in_blocks * DCTSIZE);
-               data_ny = (unsigned char *)malloc(nw0 * stride0);
+               data_ny = (unsigned char *)malloc(nh0 * stride0);
                hscale(npix, data_ny, w0, nh0, nw0, dinfo.comp_info[0].width_in_blocks * DCTSIZE, stride0);
                free(npix);
        }
        {
                float *npix = (float*)memalign(16, dinfo.comp_info[1].width_in_blocks * DCTSIZE * nh1 * sizeof(float)); 
                vscale(data_cr, npix, dinfo.comp_info[1].width_in_blocks * DCTSIZE, h1, nh1, dinfo.comp_info[1].width_in_blocks * DCTSIZE);
-               data_ncr = (unsigned char *)malloc(nw1 * stride1);
+               data_ncr = (unsigned char *)malloc(nh1 * stride1);
                hscale(npix, data_ncr, w1, nh1, nw1, dinfo.comp_info[1].width_in_blocks * DCTSIZE, stride1);
                free(npix);
        }
        {
                float *npix = (float*)memalign(16, dinfo.comp_info[2].width_in_blocks * DCTSIZE * nh2 * sizeof(float)); 
                vscale(data_cb, npix, dinfo.comp_info[2].width_in_blocks * DCTSIZE, h2, nh2, dinfo.comp_info[2].width_in_blocks * DCTSIZE);
-               data_ncb = (unsigned char *)malloc(nw2 * stride2);
+               data_ncb = (unsigned char *)malloc(nh2 * stride2);
                hscale(npix, data_ncb, w2, nh2, nw2, dinfo.comp_info[2].width_in_blocks * DCTSIZE, stride2);
                free(npix);
        }
@@ -432,7 +464,7 @@ int main(int argc, char **argv)
        jpeg_stdio_dest(&cinfo, stdout);
        cinfo.input_components = 3;
        jpeg_set_defaults(&cinfo);
-       jpeg_set_quality(&cinfo, 85, FALSE);
+       jpeg_set_quality(&cinfo, jpeg_quality, FALSE);
        cinfo.image_width = nominal_w;
        cinfo.image_height = nominal_h;
        cinfo.raw_data_in = TRUE;