[FFmpeg-devel] [PATCH] Swscale YUV2RGB table generator
Kostya
kostya.shishkov
Thu Feb 12 09:26:21 CET 2009
On Thu, Feb 12, 2009 at 12:44:31AM +0100, Michael Niedermayer wrote:
> On Wed, Feb 11, 2009 at 09:03:35AM +0200, Kostya wrote:
> > On Mon, Feb 09, 2009 at 05:26:29PM +0100, Michael Niedermayer wrote:
> > > On Mon, Feb 09, 2009 at 06:29:09PM +0200, Kostya wrote:
> > > > On Mon, Feb 09, 2009 at 04:55:04PM +0100, Michael Niedermayer wrote:
> > > > > On Mon, Feb 09, 2009 at 05:38:24PM +0200, Kostya wrote:
> > > > [...]
> > > > > >
> > > > > > prefixed a few
> > > > >
> > > > > a few are not all, but anyway its not your job i admit, it was that way
> > > > > already before you ...
> > > > >
> > > > > you are missing a changelog update
> > > > >
> > > > > besides this if your c code is as fast as what we have and all cases have
> > > > > been tested and the regression checksums dont change then its ok
> > > >
> > > > Err, what's the way to test it properly?
> > >
> > > swscale-example is one
> > > mplayer is the second
> > > libavfilter the third (be carefull with auto inserted scale filters because
> > > if you test one and 3 are inserted behind your back you might be confused ..)
> >
> > Tested with swscale-example and fixed the bugs in generator. Now it works properly
> > with all colour depths and full/reduced range.
>
> missing changelog entry
pick the one you like ;)
> [...]
>
> > +static void fill_table(uint8_t* table[256], int elemsize, int inc, uint8_t *y_table)
>
> maybe a few const could be added?
>
> ok except these
Since it's not wholly identical with the old one, regressions are changed too.
Attached an example of mine obtained at PPC.
> [...]
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
-------------- next part --------------
Index: Changelog
===================================================================
--- Changelog (revision 17176)
+++ Changelog (working copy)
@@ -150,6 +150,7 @@
- OpenJPEG based JPEG 2000 decoder
- NC (NC4600) cameras file demuxer
- Gopher client support
+- new LGPLed YUV to RGB tables generator in SWScaler
version 0.4.9-pre1:
-------------- next part --------------
Index: Changelog
===================================================================
--- Changelog (revision 28537)
+++ Changelog (working copy)
@@ -130,6 +130,8 @@
* vo_macosx can now be compiled in 64-bits mode
* OpenGL support for unmodified MinGW64
+ SWScaler:
+ * new LGPLed YUV to RGB tables generator
rc2try2:
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile (revision 28537)
+++ Makefile (working copy)
@@ -5,10 +5,9 @@
HEADERS = swscale.h
-OBJS = rgb2rgb.o swscale.o swscale_avoption.o
+OBJS = rgb2rgb.o swscale.o swscale_avoption.o yuv2rgb2.o
OBJS-$(ARCH_BFIN) += internal_bfin.o swscale_bfin.o yuv2rgb_bfin.o
-OBJS-$(CONFIG_GPL) += yuv2rgb.o
OBJS-$(CONFIG_MLIB) += yuv2rgb_mlib.o
OBJS-$(HAVE_ALTIVEC) += yuv2rgb_altivec.o
OBJS-$(HAVE_VIS) += yuv2rgb_vis.o
Index: swscale.c
===================================================================
--- swscale.c (revision 28537)
+++ swscale.c (working copy)
@@ -2331,14 +2331,12 @@
{
c->swScale= PlanarToNV12Wrapper;
}
-#if CONFIG_GPL
/* yuv2bgr */
if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P) && (isBGR(dstFormat) || isRGB(dstFormat))
&& !(flags & SWS_ACCURATE_RND) && !(dstH&1))
{
c->swScale= sws_yuv2rgb_get_func_ptr(c);
}
-#endif
if (srcFormat==PIX_FMT_YUV410P && dstFormat==PIX_FMT_YUV420P && !(flags & SWS_BITEXACT))
{
Index: yuv2rgb2.c
===================================================================
--- yuv2rgb2.c (revision 0)
+++ yuv2rgb2.c (revision 0)
@@ -0,0 +1,683 @@
+/*
+ * software YUV to RGB converter
+ *
+ * Copyright (C) 2009 Konstantin Shishkov
+ *
+ * MMX/MMX2 template stuff (needed for fast movntq support),
+ * 1,4,8bpp support and context / deglobalize stuff
+ * by Michael Niedermayer (michaelni at gmx.at)
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <assert.h>
+
+#include "config.h"
+#include "rgb2rgb.h"
+#include "swscale.h"
+#include "swscale_internal.h"
+
+#define DITHER1XBPP // only for MMX
+
+extern const uint8_t dither_8x8_32[8][8];
+extern const uint8_t dither_8x8_73[8][8];
+extern const uint8_t dither_8x8_220[8][8];
+
+#if HAVE_MMX && CONFIG_GPL
+
+/* hope these constant values are cache line aligned */
+DECLARE_ASM_CONST(8, uint64_t, mmx_00ffw) = 0x00ff00ff00ff00ffULL;
+DECLARE_ASM_CONST(8, uint64_t, mmx_redmask) = 0xf8f8f8f8f8f8f8f8ULL;
+DECLARE_ASM_CONST(8, uint64_t, mmx_grnmask) = 0xfcfcfcfcfcfcfcfcULL;
+
+//MMX versions
+#undef RENAME
+#undef HAVE_MMX2
+#undef HAVE_AMD3DNOW
+#define HAVE_MMX2 0
+#define HAVE_AMD3DNOW 0
+#define RENAME(a) a ## _MMX
+#include "yuv2rgb_template.c"
+
+//MMX2 versions
+#undef RENAME
+#undef HAVE_MMX2
+#define HAVE_MMX2 1
+#define RENAME(a) a ## _MMX2
+#include "yuv2rgb_template.c"
+
+#endif /* HAVE_MMX && CONFIG_GPL */
+
+const int32_t ff_yuv2rgb_coeffs[8][4] = {
+ {117504, 138453, 13954, 34903}, /* no sequence_display_extension */
+ {117504, 138453, 13954, 34903}, /* ITU-R Rec. 709 (1990) */
+ {104597, 132201, 25675, 53279}, /* unspecified */
+ {104597, 132201, 25675, 53279}, /* reserved */
+ {104448, 132798, 24759, 53109}, /* FCC */
+ {104597, 132201, 25675, 53279}, /* ITU-R Rec. 624-4 System B, G */
+ {104597, 132201, 25675, 53279}, /* SMPTE 170M */
+ {117579, 136230, 16907, 35559} /* SMPTE 240M (1987) */
+};
+
+#define LOADCHROMA(i) \
+ U = pu[i]; \
+ V = pv[i]; \
+ r = (void *)c->table_rV[V]; \
+ g = (void *)(c->table_gU[U] + c->table_gV[V]); \
+ b = (void *)c->table_bU[U];
+
+#define PUTRGB(dst,src,i,o) \
+ Y = src[2*i+o]; \
+ dst[2*i ] = r[Y] + g[Y] + b[Y]; \
+ Y = src[2*i+1-o]; \
+ dst[2*i+1] = r[Y] + g[Y] + b[Y];
+
+#define PUTRGB24(dst,src,i) \
+ Y = src[2*i]; \
+ dst[6*i+0] = r[Y]; dst[6*i+1] = g[Y]; dst[6*i+2] = b[Y]; \
+ Y = src[2*i+1]; \
+ dst[6*i+3] = r[Y]; dst[6*i+4] = g[Y]; dst[6*i+5] = b[Y];
+
+#define PUTBGR24(dst,src,i) \
+ Y = src[2*i]; \
+ dst[6*i+0] = b[Y]; dst[6*i+1] = g[Y]; dst[6*i+2] = r[Y]; \
+ Y = src[2*i+1]; \
+ dst[6*i+3] = b[Y]; dst[6*i+4] = g[Y]; dst[6*i+5] = r[Y];
+
+#define YUV2RGBFUNC(func_name, dst_type) \
+static int func_name(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, \
+ int srcSliceH, uint8_t* dst[], int dstStride[]){\
+ int y;\
+\
+ if (c->srcFormat == PIX_FMT_YUV422P) {\
+ srcStride[1] *= 2;\
+ srcStride[2] *= 2;\
+ }\
+ for (y=0; y<srcSliceH; y+=2) {\
+ dst_type *dst_1 = (dst_type*)(dst[0] + (y+srcSliceY )*dstStride[0]);\
+ dst_type *dst_2 = (dst_type*)(dst[0] + (y+srcSliceY+1)*dstStride[0]);\
+ dst_type av_unused *r, *b;\
+ dst_type *g;\
+ uint8_t *py_1 = src[0] + y*srcStride[0];\
+ uint8_t *py_2 = py_1 + srcStride[0];\
+ uint8_t *pu = src[1] + (y>>1)*srcStride[1];\
+ uint8_t *pv = src[2] + (y>>1)*srcStride[2];\
+ unsigned int h_size = c->dstW>>3;\
+ while (h_size--) {\
+ int av_unused U, V;\
+ int Y;\
+
+#define ENDYUV2RGBLINE(dst_delta)\
+ pu += 4;\
+ pv += 4;\
+ py_1 += 8;\
+ py_2 += 8;\
+ dst_1 += dst_delta;\
+ dst_2 += dst_delta;\
+ }\
+ if (c->dstW & 4) {\
+ int av_unused Y, U, V;\
+
+#define ENDYUV2RGBFUNC()\
+ }\
+ }\
+ return srcSliceH;\
+}
+
+#define CLOSEYUV2RGBFUNC(dst_delta)\
+ ENDYUV2RGBLINE(dst_delta)\
+ ENDYUV2RGBFUNC()
+
+YUV2RGBFUNC(yuv2rgb_c_32, uint32_t)
+ LOADCHROMA(0);
+ PUTRGB(dst_1,py_1,0,0);
+ PUTRGB(dst_2,py_2,0,1);
+
+ LOADCHROMA(1);
+ PUTRGB(dst_2,py_2,1,1);
+ PUTRGB(dst_1,py_1,1,0);
+ LOADCHROMA(1);
+ PUTRGB(dst_2,py_2,1,1);
+ PUTRGB(dst_1,py_1,1,0);
+
+ LOADCHROMA(2);
+ PUTRGB(dst_1,py_1,2,0);
+ PUTRGB(dst_2,py_2,2,1);
+
+ LOADCHROMA(3);
+ PUTRGB(dst_2,py_2,3,1);
+ PUTRGB(dst_1,py_1,3,0);
+ENDYUV2RGBLINE(8)
+ LOADCHROMA(0);
+ PUTRGB(dst_1,py_1,0,0);
+ PUTRGB(dst_2,py_2,0,1);
+
+ LOADCHROMA(1);
+ PUTRGB(dst_2,py_2,1,1);
+ PUTRGB(dst_1,py_1,1,0);
+ENDYUV2RGBFUNC()
+
+YUV2RGBFUNC(yuv2rgb_c_24_rgb, uint8_t)
+ LOADCHROMA(0);
+ PUTRGB24(dst_1,py_1,0);
+ PUTRGB24(dst_2,py_2,0);
+
+ LOADCHROMA(1);
+ PUTRGB24(dst_2,py_2,1);
+ PUTRGB24(dst_1,py_1,1);
+
+ LOADCHROMA(2);
+ PUTRGB24(dst_1,py_1,2);
+ PUTRGB24(dst_2,py_2,2);
+
+ LOADCHROMA(3);
+ PUTRGB24(dst_2,py_2,3);
+ PUTRGB24(dst_1,py_1,3);
+ENDYUV2RGBLINE(24)
+ LOADCHROMA(0);
+ PUTRGB24(dst_1,py_1,0);
+ PUTRGB24(dst_2,py_2,0);
+
+ LOADCHROMA(1);
+ PUTRGB24(dst_2,py_2,1);
+ PUTRGB24(dst_1,py_1,1);
+ENDYUV2RGBFUNC()
+
+// only trivial mods from yuv2rgb_c_24_rgb
+YUV2RGBFUNC(yuv2rgb_c_24_bgr, uint8_t)
+ LOADCHROMA(0);
+ PUTBGR24(dst_1,py_1,0);
+ PUTBGR24(dst_2,py_2,0);
+
+ LOADCHROMA(1);
+ PUTBGR24(dst_2,py_2,1);
+ PUTBGR24(dst_1,py_1,1);
+
+ LOADCHROMA(2);
+ PUTBGR24(dst_1,py_1,2);
+ PUTBGR24(dst_2,py_2,2);
+
+ LOADCHROMA(3);
+ PUTBGR24(dst_2,py_2,3);
+ PUTBGR24(dst_1,py_1,3);
+ENDYUV2RGBLINE(24)
+ LOADCHROMA(0);
+ PUTBGR24(dst_1,py_1,0);
+ PUTBGR24(dst_2,py_2,0);
+
+ LOADCHROMA(1);
+ PUTBGR24(dst_2,py_2,1);
+ PUTBGR24(dst_1,py_1,1);
+ENDYUV2RGBFUNC()
+
+// This is exactly the same code as yuv2rgb_c_32 except for the types of
+// r, g, b, dst_1, dst_2
+YUV2RGBFUNC(yuv2rgb_c_16, uint16_t)
+ LOADCHROMA(0);
+ PUTRGB(dst_1,py_1,0,0);
+ PUTRGB(dst_2,py_2,0,1);
+
+ LOADCHROMA(1);
+ PUTRGB(dst_2,py_2,1,1);
+ PUTRGB(dst_1,py_1,1,0);
+
+ LOADCHROMA(2);
+ PUTRGB(dst_1,py_1,2,0);
+ PUTRGB(dst_2,py_2,2,1);
+
+ LOADCHROMA(3);
+ PUTRGB(dst_2,py_2,3,1);
+ PUTRGB(dst_1,py_1,3,0);
+CLOSEYUV2RGBFUNC(8)
+
+// This is exactly the same code as yuv2rgb_c_32 except for the types of
+// r, g, b, dst_1, dst_2
+YUV2RGBFUNC(yuv2rgb_c_8, uint8_t)
+ LOADCHROMA(0);
+ PUTRGB(dst_1,py_1,0,0);
+ PUTRGB(dst_2,py_2,0,1);
+
+ LOADCHROMA(1);
+ PUTRGB(dst_2,py_2,1,1);
+ PUTRGB(dst_1,py_1,1,0);
+
+ LOADCHROMA(2);
+ PUTRGB(dst_1,py_1,2,0);
+ PUTRGB(dst_2,py_2,2,1);
+
+ LOADCHROMA(3);
+ PUTRGB(dst_2,py_2,3,1);
+ PUTRGB(dst_1,py_1,3,0);
+CLOSEYUV2RGBFUNC(8)
+
+// r, g, b, dst_1, dst_2
+YUV2RGBFUNC(yuv2rgb_c_8_ordered_dither, uint8_t)
+ const uint8_t *d32 = dither_8x8_32[y&7];
+ const uint8_t *d64 = dither_8x8_73[y&7];
+#define PUTRGB8(dst,src,i,o) \
+ Y = src[2*i]; \
+ dst[2*i] = r[Y+d32[0+o]] + g[Y+d32[0+o]] + b[Y+d64[0+o]]; \
+ Y = src[2*i+1]; \
+ dst[2*i+1] = r[Y+d32[1+o]] + g[Y+d32[1+o]] + b[Y+d64[1+o]];
+
+ LOADCHROMA(0);
+ PUTRGB8(dst_1,py_1,0,0);
+ PUTRGB8(dst_2,py_2,0,0+8);
+
+ LOADCHROMA(1);
+ PUTRGB8(dst_2,py_2,1,2+8);
+ PUTRGB8(dst_1,py_1,1,2);
+
+ LOADCHROMA(2);
+ PUTRGB8(dst_1,py_1,2,4);
+ PUTRGB8(dst_2,py_2,2,4+8);
+
+ LOADCHROMA(3);
+ PUTRGB8(dst_2,py_2,3,6+8);
+ PUTRGB8(dst_1,py_1,3,6);
+CLOSEYUV2RGBFUNC(8)
+
+
+// This is exactly the same code as yuv2rgb_c_32 except for the types of
+// r, g, b, dst_1, dst_2
+YUV2RGBFUNC(yuv2rgb_c_4, uint8_t)
+ int acc;
+#define PUTRGB4(dst,src,i) \
+ Y = src[2*i]; \
+ acc = r[Y] + g[Y] + b[Y]; \
+ Y = src[2*i+1]; \
+ acc |= (r[Y] + g[Y] + b[Y])<<4; \
+ dst[i] = acc;
+
+ LOADCHROMA(0);
+ PUTRGB4(dst_1,py_1,0);
+ PUTRGB4(dst_2,py_2,0);
+
+ LOADCHROMA(1);
+ PUTRGB4(dst_2,py_2,1);
+ PUTRGB4(dst_1,py_1,1);
+
+ LOADCHROMA(2);
+ PUTRGB4(dst_1,py_1,2);
+ PUTRGB4(dst_2,py_2,2);
+
+ LOADCHROMA(3);
+ PUTRGB4(dst_2,py_2,3);
+ PUTRGB4(dst_1,py_1,3);
+CLOSEYUV2RGBFUNC(4)
+
+YUV2RGBFUNC(yuv2rgb_c_4_ordered_dither, uint8_t)
+ const uint8_t *d64 = dither_8x8_73[y&7];
+ const uint8_t *d128 = dither_8x8_220[y&7];
+ int acc;
+
+#define PUTRGB4D(dst,src,i,o) \
+ Y = src[2*i]; \
+ acc = r[Y+d128[0+o]] + g[Y+d64[0+o]] + b[Y+d128[0+o]]; \
+ Y = src[2*i+1]; \
+ acc |= (r[Y+d128[1+o]] + g[Y+d64[1+o]] + b[Y+d128[1+o]])<<4; \
+ dst[i]= acc;
+
+ LOADCHROMA(0);
+ PUTRGB4D(dst_1,py_1,0,0);
+ PUTRGB4D(dst_2,py_2,0,0+8);
+
+ LOADCHROMA(1);
+ PUTRGB4D(dst_2,py_2,1,2+8);
+ PUTRGB4D(dst_1,py_1,1,2);
+
+ LOADCHROMA(2);
+ PUTRGB4D(dst_1,py_1,2,4);
+ PUTRGB4D(dst_2,py_2,2,4+8);
+
+ LOADCHROMA(3);
+ PUTRGB4D(dst_2,py_2,3,6+8);
+ PUTRGB4D(dst_1,py_1,3,6);
+CLOSEYUV2RGBFUNC(4)
+
+// This is exactly the same code as yuv2rgb_c_32 except for the types of
+// r, g, b, dst_1, dst_2
+YUV2RGBFUNC(yuv2rgb_c_4b, uint8_t)
+ LOADCHROMA(0);
+ PUTRGB(dst_1,py_1,0,0);
+ PUTRGB(dst_2,py_2,0,1);
+
+ LOADCHROMA(1);
+ PUTRGB(dst_2,py_2,1,1);
+ PUTRGB(dst_1,py_1,1,0);
+
+ LOADCHROMA(2);
+ PUTRGB(dst_1,py_1,2,0);
+ PUTRGB(dst_2,py_2,2,1);
+
+ LOADCHROMA(3);
+ PUTRGB(dst_2,py_2,3,1);
+ PUTRGB(dst_1,py_1,3,0);
+CLOSEYUV2RGBFUNC(8)
+
+YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t)
+ const uint8_t *d64 = dither_8x8_73[y&7];
+ const uint8_t *d128 = dither_8x8_220[y&7];
+
+#define PUTRGB4DB(dst,src,i,o) \
+ Y = src[2*i]; \
+ dst[2*i] = r[Y+d128[0+o]] + g[Y+d64[0+o]] + b[Y+d128[0+o]]; \
+ Y = src[2*i+1]; \
+ dst[2*i+1] = r[Y+d128[1+o]] + g[Y+d64[1+o]] + b[Y+d128[1+o]];
+
+ LOADCHROMA(0);
+ PUTRGB4DB(dst_1,py_1,0,0);
+ PUTRGB4DB(dst_2,py_2,0,0+8);
+
+ LOADCHROMA(1);
+ PUTRGB4DB(dst_2,py_2,1,2+8);
+ PUTRGB4DB(dst_1,py_1,1,2);
+
+ LOADCHROMA(2);
+ PUTRGB4DB(dst_1,py_1,2,4);
+ PUTRGB4DB(dst_2,py_2,2,4+8);
+
+ LOADCHROMA(3);
+ PUTRGB4DB(dst_2,py_2,3,6+8);
+ PUTRGB4DB(dst_1,py_1,3,6);
+CLOSEYUV2RGBFUNC(8)
+
+YUV2RGBFUNC(yuv2rgb_c_1_ordered_dither, uint8_t)
+ const uint8_t *d128 = dither_8x8_220[y&7];
+ char out_1 = 0, out_2 = 0;
+ g= c->table_gU[128] + c->table_gV[128];
+
+#define PUTRGB1(out,src,i,o) \
+ Y = src[2*i]; \
+ out+= out + g[Y+d128[0+o]]; \
+ Y = src[2*i+1]; \
+ out+= out + g[Y+d128[1+o]];
+
+ PUTRGB1(out_1,py_1,0,0);
+ PUTRGB1(out_2,py_2,0,0+8);
+
+ PUTRGB1(out_2,py_2,1,2+8);
+ PUTRGB1(out_1,py_1,1,2);
+
+ PUTRGB1(out_1,py_1,2,4);
+ PUTRGB1(out_2,py_2,2,4+8);
+
+ PUTRGB1(out_2,py_2,3,6+8);
+ PUTRGB1(out_1,py_1,3,6);
+
+ dst_1[0]= out_1;
+ dst_2[0]= out_2;
+CLOSEYUV2RGBFUNC(1)
+
+SwsFunc sws_yuv2rgb_get_func_ptr(SwsContext *c)
+{
+ SwsFunc t = NULL;
+#if (HAVE_MMX2 || HAVE_MMX) && CONFIG_GPL
+ if (c->flags & SWS_CPU_CAPS_MMX2) {
+ switch (c->dstFormat) {
+ case PIX_FMT_RGB32: return yuv420_rgb32_MMX2;
+ case PIX_FMT_BGR24: return yuv420_rgb24_MMX2;
+ case PIX_FMT_RGB565: return yuv420_rgb16_MMX2;
+ case PIX_FMT_RGB555: return yuv420_rgb15_MMX2;
+ }
+ }
+ if (c->flags & SWS_CPU_CAPS_MMX) {
+ switch (c->dstFormat) {
+ case PIX_FMT_RGB32: return yuv420_rgb32_MMX;
+ case PIX_FMT_BGR24: return yuv420_rgb24_MMX;
+ case PIX_FMT_RGB565: return yuv420_rgb16_MMX;
+ case PIX_FMT_RGB555: return yuv420_rgb15_MMX;
+ }
+ }
+#endif
+#if HAVE_VIS
+ t = sws_yuv2rgb_init_vis(c);
+#endif
+#if CONFIG_MLIB
+ t = sws_yuv2rgb_init_mlib(c);
+#endif
+#if HAVE_ALTIVEC && CONFIG_GPL
+ if (c->flags & SWS_CPU_CAPS_ALTIVEC)
+ t = sws_yuv2rgb_init_altivec(c);
+#endif
+
+#if ARCH_BFIN
+ if (c->flags & SWS_CPU_CAPS_BFIN)
+ t = sws_ff_bfin_yuv2rgb_get_func_ptr(c);
+#endif
+
+ if (t)
+ return t;
+
+ av_log(c, AV_LOG_WARNING, "No accelerated colorspace conversion found.\n");
+
+ switch (c->dstFormat) {
+ case PIX_FMT_BGR32_1:
+ case PIX_FMT_RGB32_1:
+ case PIX_FMT_BGR32:
+ case PIX_FMT_RGB32: return yuv2rgb_c_32;
+ case PIX_FMT_RGB24: return yuv2rgb_c_24_rgb;
+ case PIX_FMT_BGR24: return yuv2rgb_c_24_bgr;
+ case PIX_FMT_RGB565:
+ case PIX_FMT_BGR565:
+ case PIX_FMT_RGB555:
+ case PIX_FMT_BGR555: return yuv2rgb_c_16;
+ case PIX_FMT_RGB8:
+ case PIX_FMT_BGR8: return yuv2rgb_c_8_ordered_dither;
+ case PIX_FMT_RGB4:
+ case PIX_FMT_BGR4: return yuv2rgb_c_4_ordered_dither;
+ case PIX_FMT_RGB4_BYTE:
+ case PIX_FMT_BGR4_BYTE: return yuv2rgb_c_4b_ordered_dither;
+ case PIX_FMT_MONOBLACK: return yuv2rgb_c_1_ordered_dither;
+ default:
+ assert(0);
+ }
+ return NULL;
+}
+
+static void fill_table(uint8_t* table[256], const int elemsize, const int inc, const uint8_t *y_table)
+{
+ int i;
+ int64_t cb = 0;
+
+ y_table -= elemsize * (inc >> 9);
+
+ for (i = 0; i < 256; i++) {
+ table[i] = y_table + elemsize * (cb >> 16);
+ cb += inc;
+ }
+}
+
+static void fill_gv_table(int table[256], const int elemsize, const int inc)
+{
+ int i;
+ int64_t cb = 0;
+ int off = -(inc >> 9);
+
+ for (i = 0; i < 256; i++) {
+ table[i] = elemsize * (off + (cb >> 16));
+ cb += inc;
+ }
+}
+
+av_cold int sws_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange,
+ int brightness, int contrast, int saturation)
+{
+ const int isRgb = c->dstFormat==PIX_FMT_RGB32
+ || c->dstFormat==PIX_FMT_RGB32_1
+ || c->dstFormat==PIX_FMT_BGR24
+ || c->dstFormat==PIX_FMT_RGB565
+ || c->dstFormat==PIX_FMT_RGB555
+ || c->dstFormat==PIX_FMT_RGB8
+ || c->dstFormat==PIX_FMT_RGB4
+ || c->dstFormat==PIX_FMT_RGB4_BYTE
+ || c->dstFormat==PIX_FMT_MONOBLACK;
+ const int bpp = fmt_depth(c->dstFormat);
+ uint8_t *y_table;
+ uint16_t *y_table16;
+ uint32_t *y_table32;
+ int i, base, rbase, gbase, bbase;
+ const int yoffs = fullRange ? 384 : 326;
+
+ int64_t crv = inv_table[0];
+ int64_t cbu = inv_table[1];
+ int64_t cgu = -inv_table[2];
+ int64_t cgv = -inv_table[3];
+ int64_t cy = 1<<16;
+ int64_t oy = 0;
+
+ int64_t yb = 0;
+
+ if (!fullRange) {
+ cy = (cy*255) / 219;
+ oy = 16<<16;
+ } else {
+ crv = (crv*224) / 255;
+ cbu = (cbu*224) / 255;
+ cgu = (cgu*224) / 255;
+ cgv = (cgv*224) / 255;
+ }
+
+ cy = (cy *contrast ) >> 16;
+ crv = (crv*contrast * saturation) >> 32;
+ cbu = (cbu*contrast * saturation) >> 32;
+ cgu = (cgu*contrast * saturation) >> 32;
+ cgv = (cgv*contrast * saturation) >> 32;
+ oy -= 256*brightness;
+
+ //scale coefficients by cy
+ crv = ((crv << 16) + 0x8000) / cy;
+ cbu = ((cbu << 16) + 0x8000) / cy;
+ cgu = ((cgu << 16) + 0x8000) / cy;
+ cgv = ((cgv << 16) + 0x8000) / cy;
+
+ av_free(c->yuvTable);
+
+ switch (bpp) {
+ case 1:
+ c->yuvTable = av_malloc(1024);
+ y_table = c->yuvTable;
+ yb = -(384<<16) - oy;
+ for (i = 0; i < 1024-110; i++) {
+ y_table[i+110] = av_clip_uint8((yb + 0x8000) >> 16) >> 7;
+ yb += cy;
+ }
+ fill_table(c->table_gU, 1, cgu, y_table + yoffs);
+ fill_gv_table(c->table_gV, 1, cgv);
+ break;
+ case 4:
+ case 4|128:
+ rbase = isRgb ? 3 : 0;
+ gbase = 1;
+ bbase = isRgb ? 0 : 3;
+ c->yuvTable = av_malloc(1024*3);
+ y_table = c->yuvTable;
+ yb = -(384<<16) - oy;
+ for (i = 0; i < 1024-110; i++) {
+ int yval = av_clip_uint8((yb + 0x8000) >> 16);
+ y_table[i+110 ] = (yval >> 7) << rbase;
+ y_table[i+ 37+1024] = ((yval + 43) / 85) << gbase;
+ y_table[i+110+2048] = (yval >> 7) << bbase;
+ yb += cy;
+ }
+ fill_table(c->table_rV, 1, crv, y_table + yoffs);
+ fill_table(c->table_gU, 1, cgu, y_table + yoffs + 1024);
+ fill_table(c->table_bU, 1, cbu, y_table + yoffs + 2048);
+ fill_gv_table(c->table_gV, 1, cgv);
+ break;
+ case 8:
+ rbase = isRgb ? 5 : 0;
+ gbase = isRgb ? 2 : 3;
+ bbase = isRgb ? 0 : 6;
+ c->yuvTable = av_malloc(1024*3);
+ y_table = c->yuvTable;
+ yb = -(384<<16) - oy;
+ for (i = 0; i < 1024-38; i++) {
+ int yval = av_clip_uint8((yb + 0x8000) >> 16);
+ y_table[i+16 ] = ((yval + 18) / 36) << rbase;
+ y_table[i+16+1024] = ((yval + 18) / 36) << gbase;
+ y_table[i+37+2048] = ((yval + 43) / 85) << bbase;
+ yb += cy;
+ }
+ fill_table(c->table_rV, 1, crv, y_table + yoffs);
+ fill_table(c->table_gU, 1, cgu, y_table + yoffs + 1024);
+ fill_table(c->table_bU, 1, cbu, y_table + yoffs + 2048);
+ fill_gv_table(c->table_gV, 1, cgv);
+ break;
+ case 15:
+ case 16:
+ rbase = isRgb ? bpp - 5 : 0;
+ gbase = 5;
+ bbase = isRgb ? 0 : (bpp - 5);
+ c->yuvTable = av_malloc(1024*3*2);
+ y_table16 = c->yuvTable;
+ yb = -(384<<16) - oy;
+ for (i = 0; i < 1024; i++) {
+ uint8_t yval = av_clip_uint8((yb + 0x8000) >> 16);
+ y_table16[i ] = (yval >> 3) << rbase;
+ y_table16[i+1024] = (yval >> (18 - bpp)) << gbase;
+ y_table16[i+2048] = (yval >> 3) << bbase;
+ yb += cy;
+ }
+ fill_table(c->table_rV, 2, crv, y_table16 + yoffs);
+ fill_table(c->table_gU, 2, cgu, y_table16 + yoffs + 1024);
+ fill_table(c->table_bU, 2, cbu, y_table16 + yoffs + 2048);
+ fill_gv_table(c->table_gV, 2, cgv);
+ break;
+ case 24:
+ c->yuvTable = av_malloc(1024);
+ y_table = c->yuvTable;
+ yb = -(384<<16) - oy;
+ for (i = 0; i < 1024; i++) {
+ y_table[i] = av_clip_uint8((yb + 0x8000) >> 16);
+ yb += cy;
+ }
+ fill_table(c->table_rV, 1, crv, y_table + yoffs);
+ fill_table(c->table_gU, 1, cgu, y_table + yoffs);
+ fill_table(c->table_bU, 1, cbu, y_table + yoffs);
+ fill_gv_table(c->table_gV, 1, cgv);
+ break;
+ case 32:
+ base = (c->dstFormat == PIX_FMT_RGB32_1 || c->dstFormat == PIX_FMT_BGR32_1) ? 8 : 0;
+ rbase = base + (isRgb ? 16 : 0);
+ gbase = base + 8;
+ bbase = base + (isRgb ? 0 : 16);
+ c->yuvTable = av_malloc(1024*3*4);
+ y_table32 = c->yuvTable;
+ yb = -(384<<16) - oy;
+ for (i = 0; i < 1024; i++) {
+ uint8_t yval = av_clip_uint8((yb + 0x8000) >> 16);
+ y_table32[i ] = yval << rbase;
+ y_table32[i+1024] = yval << gbase;
+ y_table32[i+2048] = yval << bbase;
+ yb += cy;
+ }
+ fill_table(c->table_rV, 4, crv, y_table32 + yoffs);
+ fill_table(c->table_gU, 4, cgu, y_table32 + yoffs + 1024);
+ fill_table(c->table_bU, 4, cbu, y_table32 + yoffs + 2048);
+ fill_gv_table(c->table_gV, 4, cgv);
+ break;
+ default:
+ c->yuvTable = NULL;
+ av_log(c, AV_LOG_ERROR, "%ibpp not supported by yuv2rgb\n", bpp);
+ return -1;
+ }
+ return 0;
+}
-------------- next part --------------
--- libav.regression.ref 2009-02-07 12:49:29.000000000 +0200
+++ data/lavf.regression 2009-02-12 09:07:06.000000000 +0200
@@ -24,49 +24,49 @@
af78858062599fcbba049e4a02588a15 *./tests/data/b-libav.mov
366879 ./tests/data/b-libav.mov
./tests/data/b-libav.mov CRC=0x45079dca
-913b6199765b1dcba196706574621c2f *./tests/data/b-libav.dv
+ce752c9e014ca11a0e4bdf1129451756 *./tests/data/b-libav.dv
3600000 ./tests/data/b-libav.dv
-./tests/data/b-libav.dv CRC=0x7787e173
-8441d11ebee0465f1a672586485f3506 *./tests/data/b-libav.gxf
-805996 ./tests/data/b-libav.gxf
-./tests/data/b-libav.gxf CRC=0x9c06676e
+./tests/data/b-libav.dv CRC=0x645ce571
+0e5458da4fb47555f64cd0e3d54168b8 *./tests/data/b-libav.gxf
+ 805460 ./tests/data/b-libav.gxf
+./tests/data/b-libav.gxf CRC=0xd8ed3b8b
66a6584f9e83e8ea3af822a3ba71fbbe *./tests/data/b-libav.nut
329264 ./tests/data/b-libav.nut
./tests/data/b-libav.nut CRC=0x400c29e9
6f4e64d21325f6721cdbddca2626e5df *./tests/data/b-libav.mkv
329797 ./tests/data/b-libav.mkv
./tests/data/b-libav.mkv CRC=0x400c29e9
-af195c31e8f49de61e3851ccde4c3ebd *./tests/data/b-pbmpipe.pbm
+1008f5b7487c76314772e1346e0bd478 *./tests/data/b-pbmpipe.pbm
317075 ./tests/data/b-pbmpipe.pbm
-./tests/data/b-pbmpipe.pbm CRC=0x1ac46c70
+./tests/data/b-pbmpipe.pbm CRC=0x806e17d8
aff140ce80a1c86c1bf54118ad23da7b *./tests/data/b-pgmpipe.pgm
2534775 ./tests/data/b-pgmpipe.pgm
./tests/data/b-pgmpipe.pgm CRC=0x0e82c482
-94939357f0cb9502c474e3b017bd745a *./tests/data/b-ppmpipe.ppm
+04a31178df1a02fab75780a08dd675ed *./tests/data/b-ppmpipe.ppm
7603575 ./tests/data/b-ppmpipe.ppm
-./tests/data/b-ppmpipe.ppm CRC=0x80b9c1bc
-b1450712a8dbb81602320d59e40ec3db *./tests/data/b-libav.gif
+./tests/data/b-ppmpipe.ppm CRC=0x08a526d3
+ef9b0cdd64452f1343eea233d7864a99 *./tests/data/b-libav.gif
2906382 ./tests/data/b-libav.gif
b977a4fedff90a79baf70c8e02986820 *./tests/data/b-libav.y4m
3801810 ./tests/data/b-libav.y4m
0a6d74b54396884f117669965b57d3b5 *./tests/data/b-libav02.pgm
./tests/data/b-libav%02d.pgm CRC=0xc8032eb1
101391 ./tests/data/b-libav02.pgm
-eb5b4ff1352f952234164ca15bd9d9e8 *./tests/data/b-libav02.ppm
-./tests/data/b-libav%02d.ppm CRC=0x13da003d
+ab6a72d232325d5d37f3b07c61466171 *./tests/data/b-libav02.ppm
+./tests/data/b-libav%02d.ppm CRC=0xcc7db98a
304143 ./tests/data/b-libav02.ppm
-419701a0c5b87283176a3cdd648649a7 *./tests/data/b-libav02.bmp
-./tests/data/b-libav%02d.bmp CRC=0x34f4003d
+895a625fb373aeba5490bd7c232b7a7c *./tests/data/b-libav02.bmp
+./tests/data/b-libav%02d.bmp CRC=0xbc34b98a
304182 ./tests/data/b-libav02.bmp
-714379cd2d4dc43b63d7b51c4d60df06 *./tests/data/b-libav02.tga
-./tests/data/b-libav%02d.tga CRC=0x34f4003d
+d7350ca3d5954cea28a0459bc90cd34d *./tests/data/b-libav02.tga
+./tests/data/b-libav%02d.tga CRC=0xbc34b98a
304172 ./tests/data/b-libav02.tga
-668be47e39d3b293b36ee4a19650888f *./tests/data/b-libav02.tiff
-./tests/data/b-libav%02d.tiff CRC=0x13da003d
-307140 ./tests/data/b-libav02.tiff
-af9d42ee21fa256dc5ec6b45f0b57f19 *./tests/data/b-libav02.sgi
-./tests/data/b-libav%02d.sgi CRC=0x13da003d
-307753 ./tests/data/b-libav02.sgi
+1df26518e9536a8608a47ee355f9a48d *./tests/data/b-libav02.tiff
+./tests/data/b-libav%02d.tiff CRC=0xcc7db98a
+ 307219 ./tests/data/b-libav02.tiff
+26b901d0160a21c3d46f0205dc2e4e5d *./tests/data/b-libav02.sgi
+./tests/data/b-libav%02d.sgi CRC=0xcc7db98a
+ 309606 ./tests/data/b-libav02.sgi
8dd3739ea6778335f57fb3e2a28c6453 *./tests/data/b-libav02.jpg
./tests/data/b-libav%02d.jpg CRC=0x2e3e4535
31586 ./tests/data/b-libav02.jpg
@@ -100,33 +100,33 @@
304128 ./tests/data/b-libav-yuv422p.yuv
52bb2f530036c657edc512965258d735 *./tests/data/b-libav-yuv444p.yuv
304128 ./tests/data/b-libav-yuv444p.yuv
-345bf1aff3fa9eba908bb8ebef284346 *./tests/data/b-libav-yuyv422.yuv
+cd761f29085c0bf184093798d8741870 *./tests/data/b-libav-yuyv422.yuv
304128 ./tests/data/b-libav-yuyv422.yuv
e2d4633215bc12b933eb733cfbd9c022 *./tests/data/b-libav-yuv410p.yuv
304128 ./tests/data/b-libav-yuv410p.yuv
692c12328dce2b5785bd658425660296 *./tests/data/b-libav-yuv411p.yuv
304128 ./tests/data/b-libav-yuv411p.yuv
-a0b0e086c800ee0b590c2f85bbff5e79 *./tests/data/b-libav-yuvj420p.yuv
+9204e83bc09e39859729a28e60751f1b *./tests/data/b-libav-yuvj420p.yuv
304128 ./tests/data/b-libav-yuvj420p.yuv
-b365c84c3d3f3a9d6d3a7f942ac68e79 *./tests/data/b-libav-yuvj422p.yuv
+9c7a932ccbea3104046b1a85988a6400 *./tests/data/b-libav-yuvj422p.yuv
304128 ./tests/data/b-libav-yuvj422p.yuv
a79eea1bb595f8ede8dad2c82346ce6a *./tests/data/b-libav-yuvj444p.yuv
304128 ./tests/data/b-libav-yuvj444p.yuv
-20dc18820fb75d5b3c446aae2f3ebf5a *./tests/data/b-libav-rgb24.yuv
+330ae0c5c7ce775b6825bef067581e6d *./tests/data/b-libav-rgb24.yuv
304128 ./tests/data/b-libav-rgb24.yuv
-20dc18820fb75d5b3c446aae2f3ebf5a *./tests/data/b-libav-bgr24.yuv
+330ae0c5c7ce775b6825bef067581e6d *./tests/data/b-libav-bgr24.yuv
304128 ./tests/data/b-libav-bgr24.yuv
-20dc18820fb75d5b3c446aae2f3ebf5a *./tests/data/b-libav-rgb32.yuv
+330ae0c5c7ce775b6825bef067581e6d *./tests/data/b-libav-rgb32.yuv
304128 ./tests/data/b-libav-rgb32.yuv
-8e84e5fb320e57e2e137ba8608394a47 *./tests/data/b-libav-rgb565.yuv
+d86c3fa21db8b4eaf3efb66b7b245e46 *./tests/data/b-libav-rgb565.yuv
304128 ./tests/data/b-libav-rgb565.yuv
-9b74239ec2e35e70c669a2a6ad550f8c *./tests/data/b-libav-rgb555.yuv
+64d733888d3f17513383453fae238fdc *./tests/data/b-libav-rgb555.yuv
304128 ./tests/data/b-libav-rgb555.yuv
838958bb95a41057a18bbb647c39ba87 *./tests/data/b-libav-gray.yuv
304128 ./tests/data/b-libav-gray.yuv
-924f069f4c9ad5beeb7e56f6b701b1a5 *./tests/data/b-libav-monow.yuv
+c7c9d2b2926e1677c27bd7df89f53073 *./tests/data/b-libav-monow.yuv
304128 ./tests/data/b-libav-monow.yuv
-924f069f4c9ad5beeb7e56f6b701b1a5 *./tests/data/b-libav-monob.yuv
+c7c9d2b2926e1677c27bd7df89f53073 *./tests/data/b-libav-monob.yuv
304128 ./tests/data/b-libav-monob.yuv
ac2c17f1a27d928e8b82f21dbafdd715 *./tests/data/b-libav-yuv440p.yuv
304128 ./tests/data/b-libav-yuv440p.yuv
More information about the ffmpeg-devel
mailing list