diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2020-03-12 15:16:44 +0200 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-03-27 08:55:45 +0000 |
| commit | 3fdfd54b023b1eedd85adf3d16e5667311b49b2c (patch) | |
| tree | 862b876716a6d4a80285672c7d84bd07ea025748 /ext | |
| parent | 00a08c69acc99566d6ceac0b5a8cc5b532a62dfa (diff) | |
| download | gstreamer-plugins-good-3fdfd54b023b1eedd85adf3d16e5667311b49b2c.tar.gz | |
gdkpixbufoverlay: Use GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS for the supported formats
We don't do any blending by ourselves since a while now.
Note that this is a regression in "supported" formats: previously
ARGB64 was supported, for example, but in practice it caused blending to
not take place at all.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gdk_pixbuf/gstgdkpixbufoverlay.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ext/gdk_pixbuf/gstgdkpixbufoverlay.c b/ext/gdk_pixbuf/gstgdkpixbufoverlay.c index 8981d9603..98b2f7fb7 100644 --- a/ext/gdk_pixbuf/gstgdkpixbufoverlay.c +++ b/ext/gdk_pixbuf/gstgdkpixbufoverlay.c @@ -93,13 +93,6 @@ enum PROP_ALPHA }; -#define VIDEO_FORMATS "{ RGBx, RGB, BGR, BGRx, xRGB, xBGR, " \ - "RGBA, BGRA, ARGB, ABGR, I420, YV12, AYUV, YUY2, UYVY, " \ - "v308, v210, v216, Y41B, Y42B, Y444, YVYU, NV12, NV21, UYVP, " \ - "RGB16, BGR16, RGB15, BGR15, UYVP, A420, YUV9, YVU9, " \ - "IYU1, ARGB64, AYUV64, r210, I420_10LE, I420_10BE, " \ - "GRAY8, GRAY16_BE, GRAY16_LE }" - /* FIXME 2.0: change to absolute positioning */ #define DEFAULT_POSITIONING_MODE \ GST_GDK_PIXBUF_POSITIONING_PIXELS_RELATIVE_TO_EDGES @@ -107,13 +100,15 @@ enum static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (VIDEO_FORMATS)) + GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE + (GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS)) ); static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (VIDEO_FORMATS)) + GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE + (GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS)) ); G_DEFINE_TYPE (GstGdkPixbufOverlay, gst_gdk_pixbuf_overlay, |