From 6b73a91ec2495921ae5b49cdf2e0d6c216dc33c5 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Tue, 16 Sep 2014 03:14:24 +0100 Subject: video-sink: add RGBx/BGRx support --- clutter-gst/clutter-gst-video-sink.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'clutter-gst') diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index 461bdff..024156e 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -97,10 +97,13 @@ GST_DEBUG_CATEGORY_STATIC (clutter_gst_video_sink_debug); "I420," \ "RGBA," \ "BGRA," \ + "RGBX," \ + "BGRX," \ "RGB," \ "BGR," \ "NV12 }" + #define MAKE_CAPS(feature, caps) \ GST_VIDEO_CAPS_MAKE_WITH_FEATURES(feature "," GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION, caps) \ ";" \ @@ -1343,7 +1346,7 @@ static ClutterGstRenderer rgb32_glsl_renderer = ";" #endif MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, - "{ RGBA, BGRA }")), + "{ RGBA, BGRA, RGBx, BGRx }")), 1, /* n_layers */ clutter_gst_rgb32_glsl_setup_pipeline, clutter_gst_rgb32_upload, @@ -1357,7 +1360,7 @@ static ClutterGstRenderer rgb32_renderer = CLUTTER_GST_RGB32, 0, GST_STATIC_CAPS (MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, - "{ RGBA, BGRA }")), + "{ RGBA, BGRA, RGBx, BGRx }")), 2, /* n_layers */ clutter_gst_rgb32_setup_pipeline, clutter_gst_rgb32_upload, @@ -1852,10 +1855,12 @@ clutter_gst_video_sink_parse_caps (GstCaps *caps, bgr = TRUE; break; case GST_VIDEO_FORMAT_RGBA: + case GST_VIDEO_FORMAT_RGBx: format = CLUTTER_GST_RGB32; bgr = FALSE; break; case GST_VIDEO_FORMAT_BGRA: + case GST_VIDEO_FORMAT_BGRx: format = CLUTTER_GST_RGB32; bgr = TRUE; break; -- cgit v1.2.1