diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/colorspace/gstcolorspace.c | 18 | ||||
| -rw-r--r-- | gst/colorspace/yuv2yuv.c | 79 |
3 files changed, 95 insertions, 9 deletions
@@ -1,3 +1,10 @@ +2004-01-15 Ronald Bultje <rbultje@ronald.bitfreak.net> + + * gst/colorspace/gstcolorspace.c: + * gst/colorspace/yuv2yuv.c: (gst_colorspace_yuy2_to_i420), + (gst_colorspace_i420_to_yv12): + Fix compiling... Didn't test if it actually works. + 2004-01-15 David Schleef <ds@schleef.org> * configure.ac: diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c index e923c3a1..eaf79083 100644 --- a/gst/colorspace/gstcolorspace.c +++ b/gst/colorspace/gstcolorspace.c @@ -28,11 +28,11 @@ static GstColorspaceFormat gst_colorspace_formats[] = { - { GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("I420")) }, - { GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS("YV12")) }, - { GST_STATIC_CAPS (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32) }, - { GST_STATIC_CAPS (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24) }, - { GST_STATIC_CAPS (GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_16) }, + { GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV("I420")) }, + { GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV("YV12")) }, + { GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB) }, + { GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB) }, + { GST_STATIC_CAPS (GST_VIDEO_CAPS_RGB_16) }, }; static GstColorspaceConverter gst_colorspace_converters[] = { @@ -56,7 +56,7 @@ GST_STATIC_PAD_TEMPLATE ( "sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YV12 }")) + GST_STATIC_CAPS (GST_VIDEO_CAPS_YUV ("{ I420, YV12 }")) ); static GstStaticPadTemplate gst_colorspace_src_template = @@ -65,9 +65,9 @@ GST_STATIC_PAD_TEMPLATE ( GST_PAD_SRC, GST_PAD_ALWAYS, GST_STATIC_CAPS ( - GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_32 "; " - GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_24 "; " - GST_VIDEO_RGB_PAD_TEMPLATE_CAPS_16 + GST_VIDEO_CAPS_xRGB "; " + GST_VIDEO_CAPS_RGB "; " + GST_VIDEO_CAPS_RGB_16 ) ); diff --git a/gst/colorspace/yuv2yuv.c b/gst/colorspace/yuv2yuv.c new file mode 100644 index 00000000..4a7560d4 --- /dev/null +++ b/gst/colorspace/yuv2yuv.c @@ -0,0 +1,79 @@ +/* GStreamer + * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include "config.h" + +#include <math.h> +#include <stdlib.h> +#include <string.h> + +#include <gst/gst.h> + +/*#undef HAVE_LIBMMX */ + +#ifdef HAVE_LIBMMX +#include "mmx.h" +#endif + +void gst_colorspace_yuy2_to_i420(unsigned char *src, unsigned char *dest, guint width, guint height) +{ + int size, i, j; + guchar *desty, *destr, *destb; + + size = width * height; + + desty = dest; + destr = desty + size; + destb = destr + (size>>2); + + for (i=0; i<height; i++) { + for (j=0; j<(width>>1); j++) { + *desty++ = *src; + *desty++ = *(src+2); + if ((i&1) == 0) { + *destr++ = *(src+1); + *destb++ = *(src+3); + } + src += 4; + } + } +} + +void gst_colorspace_i420_to_yv12(unsigned char *src, unsigned char *dest, guint width, guint height) +{ + int size, i; + guint8 *destcr, *destcb; + + size = width * height; + + memcpy (dest, src, size); + + src += size; + destcr = dest + size; + size >>=2; + destcb = destcr + size; + + i=size; + while (i--) + *destcb++ = *src++; + i=size; + while (i--) + *destcr++ = *src++; +} + |