From ec782a5f27ee195ccf07552d64b0f2943ccacd35 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Mon, 9 Jul 2012 16:13:39 +1000 Subject: [PATCH] [528/906] GstGLMeta: seperate upload/download/normal GL caps video formats differentiate between upload, download and GL caps --- gst-libs/gst/gl/gstglmeta.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/gl/gstglmeta.h b/gst-libs/gst/gl/gstglmeta.h index f611d6dd23..f099f2ab53 100644 --- a/gst-libs/gst/gl/gstglmeta.h +++ b/gst-libs/gst/gl/gstglmeta.h @@ -56,12 +56,23 @@ struct _GstGLMeta { GstGLMemory *memory; }; +#define GST_GL_VIDEO_FORMATS "RGBA" +#define GST_GL_VIDEO_CAPS GST_VIDEO_CAPS_MAKE (GST_GL_VIDEO_FORMATS) + #ifndef OPENGL_ES2 -# define GST_GL_VIDEO_CAPS \ - GST_VIDEO_CAPS_MAKE ("{ RGB, RGBx, RGBA, BGR, BGRx, BGRA, xRGB, xBGR, ARGB, ABGR, I420, YV12, YUY2, UYVY, AYUV }") + +# define GST_GL_UPLOAD_FORMATS "{ RGB, RGBx, RGBA, BGR, BGRx, BGRA, xRGB, xBGR, ARGB, ABGR, I420, YV12, YUY2, UYVY, AYUV }" +# define GST_GL_DOWNLOAD_FORMATS "{ RGB, RGBx, RGBA, BGR, BGRx, BGRA, xRGB, xBGR, ARGB, ABGR, I420, YV12, YUY2, UYVY, AYUV }" +# define GST_GL_UPLOAD_VIDEO_CAPS GST_VIDEO_CAPS_MAKE (GST_GL_UPLOAD_FORMATS) +# define GST_GL_DOWNLOAD_VIDEO_CAPS GST_VIDEO_CAPS_MAKE (GST_GL_DOWNLOAD_FORMATS) + #else /* OPENGL_ES2 */ -# define GST_GL_VIDEO_CAPS \ - GST_VIDEO_CAPS_MAKE ("{ RGB, RGBx, RGBA, I420, YV12, YUY2, UYVY, AYUV }") + +# define GST_GL_UPLOAD_FORMATS "{ RGB, RGBx, RGBA, I420, YV12, YUY2, UYVY, AYUV }" +# define GST_GL_DOWNLOAD_FORMATS "{ RGB, RGBx, RGBA, I420, YV12, YUY2, UYVY, AYUV }" +# define GST_GL_UPLOAD_VIDEO_CAPS GST_VIDEO_CAPS_MAKE (GST_GL_UPLOAD_FORMATS) +# define GST_GL_DOWNLOAD_VIDEO_CAPS GST_VIDEO_CAPS_MAKE (GST_GL_DOWNLOAD_FORMATS) + #endif /* OPENGL_ES2 */ #define gst_buffer_get_gl_meta(b) ((GstGLMeta*)gst_buffer_get_meta((b),GST_GL_META_API_TYPE))