From 75c92dc915160bd8d449d6bb4bd7393331107964 Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Wed, 26 Mar 2014 23:13:53 +0000 Subject: [PATCH] gl: only set CAPS_FEATURE_MEMORY_EGL_IMAGE on egl platform --- ext/gl/gstglimagesink.c | 9 ++++++--- gst-libs/gst/gl/gstglfilter.c | 12 ++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ext/gl/gstglimagesink.c b/ext/gl/gstglimagesink.c index d0c690f..6db9cfa 100644 --- a/ext/gl/gstglimagesink.c +++ b/ext/gl/gstglimagesink.c @@ -173,9 +173,12 @@ static GstStaticPadTemplate gst_glimage_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES - (GST_CAPS_FEATURE_MEMORY_EGL_IMAGE, - "RGBA") "; " GST_VIDEO_CAPS_MAKE (GST_GL_UPLOAD_FORMATS) "; " + GST_STATIC_CAPS ( +#if GST_GL_HAVE_PLATFORM_EGL + GST_VIDEO_CAPS_MAKE_WITH_FEATURES + (GST_CAPS_FEATURE_MEMORY_EGL_IMAGE, "RGBA") "; " +#endif + GST_VIDEO_CAPS_MAKE (GST_GL_UPLOAD_FORMATS) "; " GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, GST_GL_UPLOAD_FORMATS)) diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c index b4af7f7..1358e00 100644 --- a/gst-libs/gst/gl/gstglfilter.c +++ b/gst-libs/gst/gl/gstglfilter.c @@ -38,9 +38,11 @@ static GstStaticPadTemplate gst_gl_filter_src_pad_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES - (GST_CAPS_FEATURE_MEMORY_EGL_IMAGE, + GST_STATIC_CAPS ( +#if GST_GL_HAVE_PLATFORM_EGL + GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_EGL_IMAGE, "RGBA") "; " +#endif GST_VIDEO_CAPS_MAKE (GST_GL_DOWNLOAD_FORMATS) "; " GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, @@ -51,9 +53,11 @@ static GstStaticPadTemplate gst_gl_filter_sink_pad_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE_WITH_FEATURES - (GST_CAPS_FEATURE_MEMORY_EGL_IMAGE, + GST_STATIC_CAPS ( +#if GST_GL_HAVE_PLATFORM_EGL + GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_MEMORY_EGL_IMAGE, "RGBA") "; " +#endif GST_VIDEO_CAPS_MAKE (GST_GL_UPLOAD_FORMATS) "; " GST_VIDEO_CAPS_MAKE_WITH_FEATURES (GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META, -- 2.7.4