mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

playsinkconvertbin: Make sure to intersect raw caps with our converter caps

Browse source 
Otherwise we end up allowing video/x-raw with arbitrary caps features that are
not handled by our converters.

https://bugzilla.gnome.org/show_bug.cgi?id=734683
This commit is contained in:
Sebastian Dröge 2014-08-13 14:28:05 +03:00
parent 02d1ab0d1c
commit d280bba126
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/playback/gstplaysinkconvertbin.c
View file

@ -382,7 +382,29 @@ gst_play_sink_convert_bin_getcaps (GstPad * pad, GstCaps * filter)
* it doesn't handle the filter caps but we could still convert * it doesn't handle the filter caps but we could still convert
* to these caps */ * to these caps */
if (filter) { if (filter) {
downstream_filter = gst_caps_copy (filter); guint i, n;
downstream_filter = gst_caps_new_empty ();
/* Intersect raw video caps in the filter caps with the converter
* caps. This makes sure that we don't accept raw video that we
* can't handle, e.g. because of caps features */
n = gst_caps_get_size (filter);
for (i = 0; i < n; i++) {
GstStructure *s;
GstCaps *tmp, *tmp2;
s = gst_structure_copy (gst_caps_get_structure (filter, i));
if (gst_structure_has_name (s,
self->audio ? "audio/x-raw" : "video/x-raw")) {
tmp = gst_caps_new_full (s, NULL);
tmp2 = gst_caps_intersect (tmp, self->converter_caps);
gst_caps_append (downstream_filter, tmp2);
gst_caps_unref (tmp);
} else {
gst_caps_append_structure (downstream_filter, s);
}
}
downstream_filter = downstream_filter =
gst_caps_merge (downstream_filter, gst_caps_merge (downstream_filter,
gst_caps_ref (self->converter_caps)); gst_caps_ref (self->converter_caps));