1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
3 Date: Tue, 26 Apr 2022 23:06:51 +0000
4 Subject: [PATCH] video-sink: Remove RGBx/BGRx support
6 The rgb24 renderer uses the wrong pixel stride and the rgb32 renderer
7 assumes alpha is meaningful. We can use neither.
9 Fixes: https://gitlab.gnome.org/GNOME/cheese/-/issues/51
11 clutter-gst/clutter-gst-video-sink.c | 8 ++------
12 1 file changed, 2 insertions(+), 6 deletions(-)
14 diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
15 index 2cbabe6043ca..2c1c10c7810b 100644
16 --- a/clutter-gst/clutter-gst-video-sink.c
17 +++ b/clutter-gst/clutter-gst-video-sink.c
18 @@ -98,8 +98,6 @@ GST_DEBUG_CATEGORY_STATIC (clutter_gst_video_sink_debug);
27 @@ -1392,21 +1390,21 @@ static ClutterGstRenderer rgb32_glsl_renderer =
30 MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,
31 - "{ RGBA, BGRA, RGBx, BGRx }")),
34 clutter_gst_rgb32_glsl_setup_pipeline,
35 clutter_gst_rgb32_upload,
36 clutter_gst_rgb32_upload_gl,
37 clutter_gst_dummy_shutdown,
40 static ClutterGstRenderer rgb32_renderer =
45 GST_STATIC_CAPS (MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,
46 - "{ RGBA, BGRA, RGBx, BGRx }")),
49 clutter_gst_rgb32_setup_pipeline,
50 clutter_gst_rgb32_upload,
51 @@ -1907,12 +1905,10 @@ clutter_gst_video_sink_parse_caps (GstCaps *caps,
52 format = CLUTTER_GST_NV12;
54 case GST_VIDEO_FORMAT_RGB:
55 - case GST_VIDEO_FORMAT_RGBx:
56 format = CLUTTER_GST_RGB24;
59 case GST_VIDEO_FORMAT_BGR:
60 - case GST_VIDEO_FORMAT_BGRx:
61 format = CLUTTER_GST_RGB24;