mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

textoverlay: Query downstream caps for checking if caps features are supported, not just accept-caps

Browse source 
accept-caps is not recursive and might stop at the next downstream element,
while caps queries are generally recursive. The next element might accept any
capsfeatures we want, but that doesn't mean that further downstream it will
also work.

Additionally for the future:
We should probably check if downstream *prefers* the
overlay meta, and only enforce usage of it if we can't handle
the format ourselves and thus would have to drop the overlays.
Otherwise we should prefer what downstream wants here.
This commit is contained in:
Sebastian Dröge 2015-07-28 13:57:20 +03:00
parent d4759f05f1
commit 5830db7050
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/pango/gstbasetextoverlay.c
View file

@ -727,6 +727,8 @@ gst_base_text_overlay_negotiate (GstBaseTextOverlay * overlay, GstCaps * caps)
if (upstream_has_meta) { if (upstream_has_meta) {
overlay_caps = gst_caps_ref (caps); overlay_caps = gst_caps_ref (caps);
} else { } else {
GstCaps *peercaps;
/* BaseTransform requires caps for the allocation query to work */ /* BaseTransform requires caps for the allocation query to work */
overlay_caps = gst_caps_copy (caps); overlay_caps = gst_caps_copy (caps);
f = gst_caps_get_features (overlay_caps, 0); f = gst_caps_get_features (overlay_caps, 0);
@ -734,8 +736,14 @@ gst_base_text_overlay_negotiate (GstBaseTextOverlay * overlay, GstCaps * caps)
GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION); GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
/* Then check if downstream accept overlay composition in caps */ /* Then check if downstream accept overlay composition in caps */
caps_has_meta = gst_pad_peer_query_accept_caps (overlay->srcpad, /* FIXME: We should probably check if downstream *prefers* the
overlay_caps); * overlay meta, and only enforce usage of it if we can't handle
* the format ourselves and thus would have to drop the overlays.
* Otherwise we should prefer what downstream wants here.
*/
peercaps = gst_pad_peer_query_caps (overlay->srcpad, NULL);
caps_has_meta = gst_caps_can_intersect (peercaps, overlay_caps);
gst_caps_unref (peercaps);
GST_DEBUG ("caps have overlay meta %d", caps_has_meta); GST_DEBUG ("caps have overlay meta %d", caps_has_meta);
} }