]> git.sesse.net Git - qscale/blobdiff - qscale.c
Move JPEG loading into libqscale.
[qscale] / qscale.c
index 042d3411a110f5464e218a3ef8c4b55f0af66ca8..440f9dee287328cb77e7761a5ac7a516d5c7e903 100644 (file)
--- a/qscale.c
+++ b/qscale.c
@@ -1,39 +1,60 @@
+/*
+ * 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>
 #include <string.h>
 #include <stdlib.h>
+#include "jpeglib.h"
+#include "libqscale.h"
 
-#define CACHE_LINE_FACTOR 1
+/* The number of pixels to process at a time when scaling vertically. */
+#define CACHE_LINE_FACTOR 16
 
-void myreadline(char *buf)
-{
-       char *ptr;
+/* Whether to use SSE for horizontal scaling or not (requires SSE3). */
+#define USE_HORIZONTAL_SSE 0
 
-       if (fgets(buf, 256, stdin) == NULL) {
-               fprintf(stderr, "Premuture EOF\n");
-               exit(1);
-       }
+/* Whether to use SSE for vertical scaling or not (requires only SSE1). */
+#define USE_VERTICAL_SSE 0
 
-       if (strlen(buf) == 0) {
-               return;
-       }
+#if USE_VERTICAL_SSE
+#undef CACHE_LINE_FACTOR
+#define CACHE_LINE_FACTOR 16
+#endif
 
-       ptr = &buf[strlen(buf) - 1];
-       if (*ptr == '\n') {
-               *ptr-- = 0;
-               if (*ptr == '\r') {
-                       *ptr = 0;
-               }
-       }
-}
+#ifndef M_PI
+#define M_PI 3.14159265358979323846264
+#endif
 
 double sinc(double x)
 {
-       // This is bad for very small x, should use power series instead.
-       if (x == 0.0)
-               return 1.0;
-       else
+       static const double cutoff = 1.220703668e-4;  /* sqrt(sqrt(eps)) */
+
+       if (abs(x) < cutoff) {
+               /* For small |x|, use Taylor series instead */
+               const double x2 = x * x;
+               const double x4 = x2 * x2;
+
+               return 1.0 - x2 / 6.0 + x4 / 120.0;
+       } else {
                return sin(x) / x;
+       }
 }
 
 double lanczos_tap(double x)
@@ -52,13 +73,13 @@ struct pix_desc {
        unsigned startcoeff;
 };
 
-void hscale(float *pix, unsigned char *npix, unsigned w, unsigned h, unsigned nw)
+void hscale(float *pix, unsigned char *npix, unsigned w, unsigned h, unsigned nw, unsigned sstride, unsigned dstride)
 {
        struct pix_desc *pd = (struct pix_desc *)malloc(nw * sizeof(struct pix_desc));
        int size_coeffs = 8;
        float *coeffs = (float *)malloc(size_coeffs * sizeof(float));
        int num_coeffs = 0;
-       int x, y, sx;
+       int x, y;
        double sf = (double)w / (double)nw;
        double support = (w > nw) ? (3.0 * sf) : (3.0 / sf);
 
@@ -66,6 +87,7 @@ void hscale(float *pix, unsigned char *npix, unsigned w, unsigned h, unsigned nw
        for (x = 0; x < nw; ++x) {
                int start = ceil(x * sf - support);
                int end = floor(x * sf + support);
+               int sx;
                double sum = 0.0;
 
                if (start < 0) {
@@ -75,6 +97,21 @@ void hscale(float *pix, unsigned char *npix, unsigned w, unsigned h, unsigned nw
                        end = w - 1;
                }
 
+#if USE_HORIZONTAL_SSE
+               /* round up so we get a multiple of four for the SSE code */
+               int num = (end - start + 1);
+               if (num % 4 != 0) {
+                       /* prefer aligning it if possible */
+                       if (start % 4 != 0 && start % 4 <= num % 4) {
+                               num += start % 4;
+                               start -= start % 4;
+                       }
+                       if (num % 4 != 0) {
+                               end += 4 - (num % 4);
+                       }
+               }
+#endif
+
                pd[x].start = start;
                pd[x].end = end;
                pd[x].startcoeff = num_coeffs;
@@ -86,7 +123,7 @@ void hscale(float *pix, unsigned char *npix, unsigned w, unsigned h, unsigned nw
                                size_coeffs <<= 1;
                                coeffs = (float *)realloc(coeffs, size_coeffs * sizeof(float));
                        }
-               
+
                        coeffs[num_coeffs++] = f;
                        sum += f;
                }
@@ -95,15 +132,49 @@ void hscale(float *pix, unsigned char *npix, unsigned w, unsigned h, unsigned nw
                        coeffs[pd[x].startcoeff + sx - start] /= sum;
                }
        }
-       
+
        for (y = 0; y < h; ++y) {
-               float *sptr = pix + y*w;
-               unsigned char *dptr = npix + y*nw;
+               float *sptr = pix + y*sstride;
+               unsigned char *dptr = npix + y*dstride;
+               unsigned char ch;
                for (x = 0; x < nw; ++x) {
+#if USE_HORIZONTAL_SSE
+                       int result;
+                       float acc;
+                       long tmp;
+                       static const float low = 0.0, high = 255.0;
+                       __asm__ (
+                               "pxor %1, %1               \n"
+                               "xor %2, %2                \n"
+                               "0:                        \n"
+                               "movups (%4,%2),%%xmm1     \n"
+                               "movups (%3,%2),%%xmm2     \n"
+                               "mulps %%xmm2,%%xmm1       \n"
+                               "addps %%xmm1,%1           \n"
+                               "add $16,%2                \n"
+                               "dec %5                    \n"
+                               "jnz 0b                    \n"
+                               "haddps %1,%1              \n"
+                               "haddps %1,%1              \n"
+                               "maxss %6,%1               \n"
+                               "minss %7,%1               \n"
+                               "cvtss2si %1,%0            \n"
+                               : "=r" (result),
+                                 "=&x" (acc),
+                                 "=&r" (tmp)
+                               : "r" (&coeffs[pd[x].startcoeff]),
+                                 "r" (&sptr[pd[x].start]),
+                                 "r" ((pd[x].end - pd[x].start + 1)/4),
+                                 "m" (low),
+                                 "m" (high)
+                               : "memory", "xmm1", "xmm2"
+                       );
+
+                       *dptr++ = (unsigned char)result;
+#else
                        float acc = 0.0;
                        float *cf = &coeffs[pd[x].startcoeff];
                        unsigned sx;
-                       unsigned char ch;
                        
                        for (sx = pd[x].start; sx <= pd[x].end; ++sx) {
                                acc += sptr[sx] * *cf++;
@@ -116,11 +187,16 @@ void hscale(float *pix, unsigned char *npix, unsigned w, unsigned h, unsigned nw
                        else
                                ch = (unsigned char)acc;
                        *dptr++ = ch;
+#endif
+               }
+               ch = dptr[-1];
+               for ( ; x < dstride; ++x) {
+                       *dptr++ = ch;
                }
        }
 }
 
-void vscale(unsigned char *pix, float *npix, unsigned w, unsigned h, unsigned nh)
+void vscale(unsigned char *pix, float *npix, unsigned w, unsigned h, unsigned nh, unsigned dstride)
 {
        struct pix_desc *pd = (struct pix_desc *)malloc(nh * sizeof(struct pix_desc));
        int size_coeffs = 8;
@@ -165,17 +241,106 @@ void vscale(unsigned char *pix, float *npix, unsigned w, unsigned h, unsigned nh
        }
 
 #if CACHE_LINE_FACTOR > 1
-       for (x = 0; x < w; x += CACHE_LINE_FACTOR) {
+       for (x = 0; x < (w/CACHE_LINE_FACTOR) * CACHE_LINE_FACTOR; x += CACHE_LINE_FACTOR) {
                unsigned char *sptr = pix + x;
                float *dptr = npix + x;
                for (y = 0; y < nh; ++y) {
+#if USE_VERTICAL_SSE
+                       /*
+                        * xmm0 - xmm3: acc[0..15]
+                        * xmm4: current filter coefficient
+                        * xmm5, xmm6, xmm7: scratchpad
+                        */
+                       __asm__ (
+                               /* clear */
+                               "pxor %%xmm0, %%xmm0          \n"
+                               "pxor %%xmm1, %%xmm1          \n"
+                               "pxor %%xmm2, %%xmm2          \n"
+                               "pxor %%xmm3, %%xmm3          \n"
+
+                               /* main loop */
+                               "0:                           \n"
+                               
+                               /* a zero is useful during unpacking */
+                               "pxor %%xmm4, %%xmm4          \n"
+                               
+                               /* fetch all 16 source bytes */
+                               "movups (%0), %%xmm5          \n"
+                               "prefetcht0 (%0,%3,4)         \n"
+
+                               /* unpack into words (xmm5, xmm7) */
+                               "movaps %%xmm5, %%xmm7        \n"
+                               "punpcklbw %%xmm4, %%xmm5     \n"
+                               "punpckhbw %%xmm4, %%xmm7     \n"
+
+                               /* unpack xmm5 into dwords (xmm5, xmm6) */
+                               "movaps %%xmm5, %%xmm6        \n"
+                               "punpcklwd %%xmm4, %%xmm5     \n"
+                               "punpckhwd %%xmm4, %%xmm6     \n"
+
+                               /* convert xmm5, xmm6 to floats */
+                               "cvtdq2ps %%xmm5, %%xmm5      \n"
+                               "cvtdq2ps %%xmm6, %%xmm6      \n"
+
+                               /* fetch the coefficient */
+                               "movss (%2), %%xmm4           \n"
+                               "shufps $0x0, %%xmm4, %%xmm4  \n"
+
+                               /* do the muls for xmm5 and xmm6 */
+                               "mulps %%xmm4, %%xmm5         \n"
+                               "mulps %%xmm4, %%xmm6         \n"
+                               "addps %%xmm5, %%xmm0         \n"
+                               "addps %%xmm6, %%xmm1         \n"
+
+                               /* get the zero back again */
+                               "pxor %%xmm4, %%xmm4          \n"
+
+                               /* unpack xmm7 into dwords (xmm7, xmm6) */
+                               "movaps %%xmm7, %%xmm6        \n"
+                               "punpcklwd %%xmm4, %%xmm7     \n"
+                               "punpckhwd %%xmm4, %%xmm6     \n"
+
+                               /* convert xmm7, xmm6 to floats */
+                               "cvtdq2ps %%xmm7, %%xmm7      \n"
+                               "cvtdq2ps %%xmm6, %%xmm6      \n"
+
+                               /* fetch the coefficient */
+                               "movss (%2), %%xmm4           \n"
+                               "shufps $0x0, %%xmm4, %%xmm4  \n"
+
+                               /* do the second set of muls */
+                               "mulps %%xmm4, %%xmm7         \n"
+                               "mulps %%xmm4, %%xmm6         \n"
+                               "addps %%xmm7, %%xmm2         \n"
+                               "addps %%xmm6, %%xmm3         \n"
+
+                               /* move along, and loop */
+                               "add $4, %2                   \n"
+                               "add %3, %0                   \n"
+                               "dec %1                       \n"
+                               "jnz 0b                       \n"
+
+                               /* store the values */
+                               "movaps %%xmm0, (%4)          \n"
+                               "movaps %%xmm1, 16(%4)        \n"
+                               "movaps %%xmm2, 32(%4)        \n"
+                               "movaps %%xmm3, 48(%4)        \n"
+                               : :
+                               "r" (&sptr[pd[y].start * w]),        /* 0: srcptr base */
+                               "r" (pd[y].end - pd[y].start + 1),   /* 1: filter len */
+                               "r" (&coeffs[pd[y].startcoeff]),     /* 2: coeffs base */
+                               "r" ((long)w),                       /* 3: stride */
+                               "r" (dptr)                           /* 4: dstptr base */
+                               : "memory", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7"
+                       );
+#else
                        int i;
                        float acc[CACHE_LINE_FACTOR];
                        for (i = 0; i < CACHE_LINE_FACTOR; ++i)
                                acc[i] = 0.0;
                        float *cf = &coeffs[pd[y].startcoeff];
                        unsigned sy;
-                       
+               
                        for (sy = pd[y].start; sy <= pd[y].end; ++sy) {
                                for (i = 0; i < CACHE_LINE_FACTOR; ++i) {
                                        acc[i] += sptr[sy * w + i] * *cf;
@@ -186,7 +351,8 @@ void vscale(unsigned char *pix, float *npix, unsigned w, unsigned h, unsigned nh
                        for (i = 0; i < CACHE_LINE_FACTOR; ++i) {
                                dptr[i] = acc[i];
                        }
-                       dptr += w;
+#endif
+                       dptr += dstride;
                }
        }
        for (x = (x/CACHE_LINE_FACTOR)*CACHE_LINE_FACTOR; x < w; ++x) {
@@ -205,74 +371,132 @@ void vscale(unsigned char *pix, float *npix, unsigned w, unsigned h, unsigned nh
                        }
 
                        *dptr = acc;
-                       dptr += w;
+                       dptr += dstride;
                }
        }
 }
 
-int main(void)
+int main(int argc, char **argv)
 {
-       unsigned w, h;
-       unsigned nw = 600, nh = 400;
-       //unsigned nw = 3504, nh = 2336;
-       char buf[256];
-       unsigned char *pix;
-       float *npix;
-       unsigned char *npix2;
-
-       myreadline(buf);
-       if (strcmp(buf, "P5") != 0) {
-               fprintf(stderr, "Error: Not a PGM file\n");
-               exit(1);
-       }
-       myreadline(buf);  /* comment */
-       myreadline(buf);
-
-       if (sscanf(buf, "%u %u", &w, &h) != 2) {
-               fprintf(stderr, "Error: Expected width/height\n");
-               exit(1);
-       }
+       /* 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 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;
+       unsigned nw2 = nominal_w * samp_h2 / max_samp_h, nh2 = nominal_h * samp_v2 / max_samp_v;
+
+       unsigned dstride0 = (nw0 + DCTSIZE-1) & ~(DCTSIZE-1);
+       unsigned dstride1 = (nw1 + DCTSIZE-1) & ~(DCTSIZE-1);
+       unsigned dstride2 = (nw2 + DCTSIZE-1) & ~(DCTSIZE-1);
+
+       qscale_img *img = qscale_load_jpeg_from_stdio(stdin);
+       unsigned sstride0 = (img->w0 + DCTSIZE-1) & ~(DCTSIZE-1);
+       unsigned sstride1 = (img->w1 + DCTSIZE-1) & ~(DCTSIZE-1);
+       unsigned sstride2 = (img->w2 + DCTSIZE-1) & ~(DCTSIZE-1);
+       
+       JSAMPLE *data_ny, *data_ncb, *data_ncr;
 
-       myreadline(buf);
-       if (strcmp(buf, "255") != 0) {
-               fprintf(stderr, "Error: Expected 8-bit\n");
-               exit(1);
+       {
+               float *npix = (float*)memalign(16, sstride0 * nh0 * sizeof(float));
+               vscale(img->data_y, npix, sstride0, img->h0, nh0, sstride0);
+               data_ny = (unsigned char *)malloc(nh0 * dstride0);
+               hscale(npix, data_ny, img->w0, nh0, nw0, sstride0, dstride0);
+               free(npix);
        }
-
-       pix = (unsigned char *)malloc(w * h);
-       if (pix == NULL) {
-               perror("malloc");
-               exit(1);
+       {
+               float *npix = (float*)memalign(16, sstride1 * nh1 * sizeof(float));     
+               vscale(img->data_cr, npix, sstride1, img->h1, nh1, sstride1);
+               data_ncr = (unsigned char *)malloc(nh1 * dstride1);
+               hscale(npix, data_ncr, img->w1, nh1, nw1, sstride1, dstride1);
+               free(npix);
        }
-
-       if (fread(pix, w*h, 1, stdin) != 1) {
-               fprintf(stderr, "Error: Short read\n");
-               exit(1);
+       {
+               float *npix = (float*)memalign(16, sstride2 * nh2 * sizeof(float));     
+               vscale(img->data_cb, npix, sstride2, img->h2, nh2, sstride2);
+               data_ncb = (unsigned char *)malloc(nh2 * dstride2);
+               hscale(npix, data_ncb, img->w2, nh2, nw2, sstride2, dstride2);
+               free(npix);
        }
        
-       npix = (float *)malloc(sizeof(float) * nw * h);
-       if (npix == NULL) {
-               perror("malloc");
-               exit(1);
-       }
-       npix2 = (unsigned char *)malloc(nw * nh);
-       if (npix2 == NULL) {
-               perror("malloc");
-               exit(1);
-       }
-
-       vscale(pix, npix, w, h, nh);
-       hscale(npix, npix2, w, nh, nw);
-
-       printf("P5\n# COMMENT: Made by qscale\n%u %u\n255\n", nw, nh);
-       {
-               int y, x;
-               for (y = 0; y < nh; ++y) {
-                       for (x = 0; x < nw; ++x) {
-                               putchar(npix2[y * nw + x]);
-                       }
+       struct jpeg_compress_struct cinfo;
+       struct jpeg_error_mgr jerr;
+       cinfo.err = jpeg_std_error(&jerr);
+       jpeg_create_compress(&cinfo);
+       jpeg_stdio_dest(&cinfo, stdout);
+       cinfo.input_components = 3;
+       jpeg_set_defaults(&cinfo);
+       jpeg_set_quality(&cinfo, jpeg_quality, FALSE);
+       cinfo.image_width = nominal_w;
+       cinfo.image_height = nominal_h;
+       cinfo.raw_data_in = TRUE;
+       jpeg_set_colorspace(&cinfo, JCS_YCbCr);
+       cinfo.comp_info[0].h_samp_factor = samp_h0;
+       cinfo.comp_info[0].v_samp_factor = samp_v0;
+       cinfo.comp_info[1].h_samp_factor = samp_h1;
+       cinfo.comp_info[1].v_samp_factor = samp_v1;
+       cinfo.comp_info[2].h_samp_factor = samp_h2;
+       cinfo.comp_info[2].v_samp_factor = samp_v2;
+       jpeg_start_compress(&cinfo, TRUE);
+
+       int total_lines = 0;
+       int blocks = 0;
+       while (total_lines < cinfo.comp_info[0].height_in_blocks * DCTSIZE) {
+               unsigned max_lines = cinfo.max_v_samp_factor * DCTSIZE;
+
+               JSAMPROW y_row_ptrs[max_lines];
+               JSAMPROW cb_row_ptrs[max_lines];
+               JSAMPROW cr_row_ptrs[max_lines];
+               JSAMPROW* ptrs[] = { y_row_ptrs, cb_row_ptrs, cr_row_ptrs };
+               int i;
+
+               for (i = 0; i < max_lines; ++i) {
+                       /* simple edge extension */
+                       int yline = i + blocks*DCTSIZE*cinfo.comp_info[0].v_samp_factor;
+                       if (yline > nh0 - 1)
+                               yline = nh0 - 1;
+
+                       int cbline = i + blocks*DCTSIZE*cinfo.comp_info[1].v_samp_factor;
+                       if (cbline > nh1 - 1)
+                               cbline = nh1 - 1;
+
+                       int crline = i + blocks*DCTSIZE*cinfo.comp_info[2].v_samp_factor;
+                       if (crline > nh2 - 1)
+                               crline = nh2 - 1;
+
+                       y_row_ptrs[i]  = data_ny  + yline * dstride0;
+                       cb_row_ptrs[i] = data_ncb + cbline * dstride1;
+                       cr_row_ptrs[i] = data_ncr + crline * dstride2;
                }
+               
+               total_lines += max_lines;
+               ++blocks;
+
+               jpeg_write_raw_data(&cinfo, ptrs, max_lines);
        }
+       jpeg_finish_compress(&cinfo);
+       jpeg_destroy_compress(&cinfo);
+
+       qscale_destroy(img);
 
        return 0;
 }
+