mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 10:42:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: simplifies and improves sink_get_caps.

Browse source 
The problem here was that after removing the formats and
all the things we could convert, we then intersected these
caps with the template caps.

Hence if a subclass offered permissive sink templates
(eg all the possible formats videoconvert handles), but only
one output format, then at negotiation time getcaps returned
caps with the format restricted to that format, even though
we do handle conversion.

https://bugzilla.gnome.org/show_bug.cgi?id=751255
This commit is contained in:
Mathieu Duponchelle 2015-06-20 13:36:27 +02:00
parent 55a5c5f7df
commit 1248b00c80
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst-libs/gst/video/gstvideoaggregator.c
View file

@ -842,7 +842,6 @@ gst_videoaggregator_pad_sink_getcaps (GstPad * pad, GstVideoAggregator * vagg,
{ {
GstCaps *srccaps; GstCaps *srccaps;
GstCaps *template_caps; GstCaps *template_caps;
GstCaps *filtered_caps;
GstCaps *returned_caps; GstCaps *returned_caps;
GstStructure *s; GstStructure *s;
gboolean had_current_caps = TRUE; gboolean had_current_caps = TRUE;
@ -870,14 +869,13 @@ gst_videoaggregator_pad_sink_getcaps (GstPad * pad, GstVideoAggregator * vagg,
NULL); NULL);
} }
filtered_caps = srccaps; if (filter) {
if (filter) returned_caps = gst_caps_intersect (srccaps, filter);
filtered_caps = gst_caps_intersect (srccaps, filter); gst_caps_unref (srccaps);
returned_caps = gst_caps_intersect (filtered_caps, template_caps); } else {
returned_caps = srccaps;
}
gst_caps_unref (srccaps);
if (filter)
gst_caps_unref (filtered_caps);
if (had_current_caps) if (had_current_caps)
gst_caps_unref (template_caps); gst_caps_unref (template_caps);