| Index: jdmrg565.c
|
| diff --git a/jdmrg565.c b/jdmrg565.c
|
| new file mode 100644
|
| index 0000000000000000000000000000000000000000..0a10bccb4ee20047c392a762add4769e3d647d07
|
| --- /dev/null
|
| +++ b/jdmrg565.c
|
| @@ -0,0 +1,355 @@
|
| +/*
|
| + * jdmrg565.c
|
| + *
|
| + * This file was part of the Independent JPEG Group's software:
|
| + * Copyright (C) 1994-1996, Thomas G. Lane.
|
| + * libjpeg-turbo Modifications:
|
| + * Copyright (C) 2013, Linaro Limited.
|
| + * Copyright (C) 2014, D. R. Commander.
|
| + * For conditions of distribution and use, see the accompanying README file.
|
| + *
|
| + * This file contains code for merged upsampling/color conversion.
|
| + */
|
| +
|
| +
|
| +INLINE
|
| +LOCAL(void)
|
| +h2v1_merged_upsample_565_internal (j_decompress_ptr cinfo,
|
| + JSAMPIMAGE input_buf,
|
| + JDIMENSION in_row_group_ctr,
|
| + JSAMPARRAY output_buf)
|
| +{
|
| + my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
| + register int y, cred, cgreen, cblue;
|
| + int cb, cr;
|
| + register JSAMPROW outptr;
|
| + JSAMPROW inptr0, inptr1, inptr2;
|
| + JDIMENSION col;
|
| + /* copy these pointers into registers if possible */
|
| + register JSAMPLE * range_limit = cinfo->sample_range_limit;
|
| + int * Crrtab = upsample->Cr_r_tab;
|
| + int * Cbbtab = upsample->Cb_b_tab;
|
| + INT32 * Crgtab = upsample->Cr_g_tab;
|
| + INT32 * Cbgtab = upsample->Cb_g_tab;
|
| + unsigned int r, g, b;
|
| + INT32 rgb;
|
| + SHIFT_TEMPS
|
| +
|
| + inptr0 = input_buf[0][in_row_group_ctr];
|
| + inptr1 = input_buf[1][in_row_group_ctr];
|
| + inptr2 = input_buf[2][in_row_group_ctr];
|
| + outptr = output_buf[0];
|
| +
|
| + /* Loop for each pair of output pixels */
|
| + for (col = cinfo->output_width >> 1; col > 0; col--) {
|
| + /* Do the chroma part of the calculation */
|
| + cb = GETJSAMPLE(*inptr1++);
|
| + cr = GETJSAMPLE(*inptr2++);
|
| + cred = Crrtab[cr];
|
| + cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
| + cblue = Cbbtab[cb];
|
| +
|
| + /* Fetch 2 Y values and emit 2 pixels */
|
| + y = GETJSAMPLE(*inptr0++);
|
| + r = range_limit[y + cred];
|
| + g = range_limit[y + cgreen];
|
| + b = range_limit[y + cblue];
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| +
|
| + y = GETJSAMPLE(*inptr0++);
|
| + r = range_limit[y + cred];
|
| + g = range_limit[y + cgreen];
|
| + b = range_limit[y + cblue];
|
| + rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
|
| +
|
| + WRITE_TWO_PIXELS(outptr, rgb);
|
| + outptr += 4;
|
| + }
|
| +
|
| + /* If image width is odd, do the last output column separately */
|
| + if (cinfo->output_width & 1) {
|
| + cb = GETJSAMPLE(*inptr1);
|
| + cr = GETJSAMPLE(*inptr2);
|
| + cred = Crrtab[cr];
|
| + cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
| + cblue = Cbbtab[cb];
|
| + y = GETJSAMPLE(*inptr0);
|
| + r = range_limit[y + cred];
|
| + g = range_limit[y + cgreen];
|
| + b = range_limit[y + cblue];
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| + *(INT16*)outptr = rgb;
|
| + }
|
| + }
|
| +
|
| +
|
| +INLINE
|
| +LOCAL(void)
|
| +h2v1_merged_upsample_565D_internal (j_decompress_ptr cinfo,
|
| + JSAMPIMAGE input_buf,
|
| + JDIMENSION in_row_group_ctr,
|
| + JSAMPARRAY output_buf)
|
| +{
|
| + my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
| + register int y, cred, cgreen, cblue;
|
| + int cb, cr;
|
| + register JSAMPROW outptr;
|
| + JSAMPROW inptr0, inptr1, inptr2;
|
| + JDIMENSION col;
|
| + /* copy these pointers into registers if possible */
|
| + register JSAMPLE * range_limit = cinfo->sample_range_limit;
|
| + int * Crrtab = upsample->Cr_r_tab;
|
| + int * Cbbtab = upsample->Cb_b_tab;
|
| + INT32 * Crgtab = upsample->Cr_g_tab;
|
| + INT32 * Cbgtab = upsample->Cb_g_tab;
|
| + INT32 d0 = dither_matrix[cinfo->output_scanline & DITHER_MASK];
|
| + unsigned int r, g, b;
|
| + INT32 rgb;
|
| + SHIFT_TEMPS
|
| +
|
| + inptr0 = input_buf[0][in_row_group_ctr];
|
| + inptr1 = input_buf[1][in_row_group_ctr];
|
| + inptr2 = input_buf[2][in_row_group_ctr];
|
| + outptr = output_buf[0];
|
| +
|
| + /* Loop for each pair of output pixels */
|
| + for (col = cinfo->output_width >> 1; col > 0; col--) {
|
| + /* Do the chroma part of the calculation */
|
| + cb = GETJSAMPLE(*inptr1++);
|
| + cr = GETJSAMPLE(*inptr2++);
|
| + cred = Crrtab[cr];
|
| + cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
| + cblue = Cbbtab[cb];
|
| +
|
| + /* Fetch 2 Y values and emit 2 pixels */
|
| + y = GETJSAMPLE(*inptr0++);
|
| + r = range_limit[DITHER_565_R(y + cred, d0)];
|
| + g = range_limit[DITHER_565_G(y + cgreen, d0)];
|
| + b = range_limit[DITHER_565_B(y + cblue, d0)];
|
| + d0 = DITHER_ROTATE(d0);
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| +
|
| + y = GETJSAMPLE(*inptr0++);
|
| + r = range_limit[DITHER_565_R(y + cred, d0)];
|
| + g = range_limit[DITHER_565_G(y + cgreen, d0)];
|
| + b = range_limit[DITHER_565_B(y + cblue, d0)];
|
| + d0 = DITHER_ROTATE(d0);
|
| + rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
|
| +
|
| + WRITE_TWO_PIXELS(outptr, rgb);
|
| + outptr += 4;
|
| + }
|
| +
|
| + /* If image width is odd, do the last output column separately */
|
| + if (cinfo->output_width & 1) {
|
| + cb = GETJSAMPLE(*inptr1);
|
| + cr = GETJSAMPLE(*inptr2);
|
| + cred = Crrtab[cr];
|
| + cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
| + cblue = Cbbtab[cb];
|
| + y = GETJSAMPLE(*inptr0);
|
| + r = range_limit[DITHER_565_R(y + cred, d0)];
|
| + g = range_limit[DITHER_565_G(y + cgreen, d0)];
|
| + b = range_limit[DITHER_565_B(y + cblue, d0)];
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| + *(INT16*)outptr = rgb;
|
| + }
|
| +}
|
| +
|
| +
|
| +INLINE
|
| +LOCAL(void)
|
| +h2v2_merged_upsample_565_internal (j_decompress_ptr cinfo,
|
| + JSAMPIMAGE input_buf,
|
| + JDIMENSION in_row_group_ctr,
|
| + JSAMPARRAY output_buf)
|
| +{
|
| + my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
| + register int y, cred, cgreen, cblue;
|
| + int cb, cr;
|
| + register JSAMPROW outptr0, outptr1;
|
| + JSAMPROW inptr00, inptr01, inptr1, inptr2;
|
| + JDIMENSION col;
|
| + /* copy these pointers into registers if possible */
|
| + register JSAMPLE * range_limit = cinfo->sample_range_limit;
|
| + int * Crrtab = upsample->Cr_r_tab;
|
| + int * Cbbtab = upsample->Cb_b_tab;
|
| + INT32 * Crgtab = upsample->Cr_g_tab;
|
| + INT32 * Cbgtab = upsample->Cb_g_tab;
|
| + unsigned int r, g, b;
|
| + INT32 rgb;
|
| + SHIFT_TEMPS
|
| +
|
| + inptr00 = input_buf[0][in_row_group_ctr * 2];
|
| + inptr01 = input_buf[0][in_row_group_ctr * 2 + 1];
|
| + inptr1 = input_buf[1][in_row_group_ctr];
|
| + inptr2 = input_buf[2][in_row_group_ctr];
|
| + outptr0 = output_buf[0];
|
| + outptr1 = output_buf[1];
|
| +
|
| + /* Loop for each group of output pixels */
|
| + for (col = cinfo->output_width >> 1; col > 0; col--) {
|
| + /* Do the chroma part of the calculation */
|
| + cb = GETJSAMPLE(*inptr1++);
|
| + cr = GETJSAMPLE(*inptr2++);
|
| + cred = Crrtab[cr];
|
| + cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
| + cblue = Cbbtab[cb];
|
| +
|
| + /* Fetch 4 Y values and emit 4 pixels */
|
| + y = GETJSAMPLE(*inptr00++);
|
| + r = range_limit[y + cred];
|
| + g = range_limit[y + cgreen];
|
| + b = range_limit[y + cblue];
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| +
|
| + y = GETJSAMPLE(*inptr00++);
|
| + r = range_limit[y + cred];
|
| + g = range_limit[y + cgreen];
|
| + b = range_limit[y + cblue];
|
| + rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
|
| +
|
| + WRITE_TWO_PIXELS(outptr0, rgb);
|
| + outptr0 += 4;
|
| +
|
| + y = GETJSAMPLE(*inptr01++);
|
| + r = range_limit[y + cred];
|
| + g = range_limit[y + cgreen];
|
| + b = range_limit[y + cblue];
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| +
|
| + y = GETJSAMPLE(*inptr01++);
|
| + r = range_limit[y + cred];
|
| + g = range_limit[y + cgreen];
|
| + b = range_limit[y + cblue];
|
| + rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
|
| +
|
| + WRITE_TWO_PIXELS(outptr1, rgb);
|
| + outptr1 += 4;
|
| + }
|
| +
|
| + /* If image width is odd, do the last output column separately */
|
| + if (cinfo->output_width & 1) {
|
| + cb = GETJSAMPLE(*inptr1);
|
| + cr = GETJSAMPLE(*inptr2);
|
| + cred = Crrtab[cr];
|
| + cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
| + cblue = Cbbtab[cb];
|
| +
|
| + y = GETJSAMPLE(*inptr00);
|
| + r = range_limit[y + cred];
|
| + g = range_limit[y + cgreen];
|
| + b = range_limit[y + cblue];
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| + *(INT16*)outptr0 = rgb;
|
| +
|
| + y = GETJSAMPLE(*inptr01);
|
| + r = range_limit[y + cred];
|
| + g = range_limit[y + cgreen];
|
| + b = range_limit[y + cblue];
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| + *(INT16*)outptr1 = rgb;
|
| + }
|
| +}
|
| +
|
| +
|
| +INLINE
|
| +LOCAL(void)
|
| +h2v2_merged_upsample_565D_internal (j_decompress_ptr cinfo,
|
| + JSAMPIMAGE input_buf,
|
| + JDIMENSION in_row_group_ctr,
|
| + JSAMPARRAY output_buf)
|
| +{
|
| + my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
|
| + register int y, cred, cgreen, cblue;
|
| + int cb, cr;
|
| + register JSAMPROW outptr0, outptr1;
|
| + JSAMPROW inptr00, inptr01, inptr1, inptr2;
|
| + JDIMENSION col;
|
| + /* copy these pointers into registers if possible */
|
| + register JSAMPLE * range_limit = cinfo->sample_range_limit;
|
| + int * Crrtab = upsample->Cr_r_tab;
|
| + int * Cbbtab = upsample->Cb_b_tab;
|
| + INT32 * Crgtab = upsample->Cr_g_tab;
|
| + INT32 * Cbgtab = upsample->Cb_g_tab;
|
| + INT32 d0 = dither_matrix[cinfo->output_scanline & DITHER_MASK];
|
| + INT32 d1 = dither_matrix[(cinfo->output_scanline+1) & DITHER_MASK];
|
| + unsigned int r, g, b;
|
| + INT32 rgb;
|
| + SHIFT_TEMPS
|
| +
|
| + inptr00 = input_buf[0][in_row_group_ctr*2];
|
| + inptr01 = input_buf[0][in_row_group_ctr*2 + 1];
|
| + inptr1 = input_buf[1][in_row_group_ctr];
|
| + inptr2 = input_buf[2][in_row_group_ctr];
|
| + outptr0 = output_buf[0];
|
| + outptr1 = output_buf[1];
|
| +
|
| + /* Loop for each group of output pixels */
|
| + for (col = cinfo->output_width >> 1; col > 0; col--) {
|
| + /* Do the chroma part of the calculation */
|
| + cb = GETJSAMPLE(*inptr1++);
|
| + cr = GETJSAMPLE(*inptr2++);
|
| + cred = Crrtab[cr];
|
| + cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
| + cblue = Cbbtab[cb];
|
| +
|
| + /* Fetch 4 Y values and emit 4 pixels */
|
| + y = GETJSAMPLE(*inptr00++);
|
| + r = range_limit[DITHER_565_R(y + cred, d0)];
|
| + g = range_limit[DITHER_565_G(y + cgreen, d0)];
|
| + b = range_limit[DITHER_565_B(y + cblue, d0)];
|
| + d0 = DITHER_ROTATE(d0);
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| +
|
| + y = GETJSAMPLE(*inptr00++);
|
| + r = range_limit[DITHER_565_R(y + cred, d1)];
|
| + g = range_limit[DITHER_565_G(y + cgreen, d1)];
|
| + b = range_limit[DITHER_565_B(y + cblue, d1)];
|
| + d1 = DITHER_ROTATE(d1);
|
| + rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
|
| +
|
| + WRITE_TWO_PIXELS(outptr0, rgb);
|
| + outptr0 += 4;
|
| +
|
| + y = GETJSAMPLE(*inptr01++);
|
| + r = range_limit[DITHER_565_R(y + cred, d0)];
|
| + g = range_limit[DITHER_565_G(y + cgreen, d0)];
|
| + b = range_limit[DITHER_565_B(y + cblue, d0)];
|
| + d0 = DITHER_ROTATE(d0);
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| +
|
| + y = GETJSAMPLE(*inptr01++);
|
| + r = range_limit[DITHER_565_R(y + cred, d1)];
|
| + g = range_limit[DITHER_565_G(y + cgreen, d1)];
|
| + b = range_limit[DITHER_565_B(y + cblue, d1)];
|
| + d1 = DITHER_ROTATE(d1);
|
| + rgb = PACK_TWO_PIXELS(rgb, PACK_SHORT_565(r, g, b));
|
| +
|
| + WRITE_TWO_PIXELS(outptr1, rgb);
|
| + outptr1 += 4;
|
| + }
|
| +
|
| + /* If image width is odd, do the last output column separately */
|
| + if (cinfo->output_width & 1) {
|
| + cb = GETJSAMPLE(*inptr1);
|
| + cr = GETJSAMPLE(*inptr2);
|
| + cred = Crrtab[cr];
|
| + cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
|
| + cblue = Cbbtab[cb];
|
| +
|
| + y = GETJSAMPLE(*inptr00);
|
| + r = range_limit[DITHER_565_R(y + cred, d0)];
|
| + g = range_limit[DITHER_565_G(y + cgreen, d0)];
|
| + b = range_limit[DITHER_565_B(y + cblue, d0)];
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| + *(INT16*)outptr0 = rgb;
|
| +
|
| + y = GETJSAMPLE(*inptr01);
|
| + r = range_limit[DITHER_565_R(y + cred, d1)];
|
| + g = range_limit[DITHER_565_G(y + cgreen, d1)];
|
| + b = range_limit[DITHER_565_B(y + cblue, d1)];
|
| + rgb = PACK_SHORT_565(r, g, b);
|
| + *(INT16*)outptr1 = rgb;
|
| + }
|
| +}
|
|
|