diff options
| author | Lionel Landwerlin <llandwerlin@gmail.com> | 2014-09-16 03:14:24 +0100 |
|---|---|---|
| committer | Lionel Landwerlin <llandwerlin@gmail.com> | 2014-12-06 21:57:47 +0000 |
| commit | 6b73a91ec2495921ae5b49cdf2e0d6c216dc33c5 (patch) | |
| tree | 946766425e6ed5cf31036b9720fd532f26afcc52 | |
| parent | e7c1267b05ef0e137f1dcbfa9d117cf811b092a7 (diff) | |
| download | clutter-gst-6b73a91ec2495921ae5b49cdf2e0d6c216dc33c5.tar.gz | |
video-sink: add RGBx/BGRx support
| -rw-r--r-- | clutter-gst/clutter-gst-video-sink.c | 9 |
1 files changed, 7 insertions, 2 deletions
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; |