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

vapostproc: Append featured caps rather than merge.

Browse source 
So it would be possible to honor upstream preference.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1369>
This commit is contained in:
Víctor Manuel Jáquez Leal 2021-11-16 10:40:03 +01:00
parent 718e83ed4c
commit 68379649db
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
subprojects/gst-plugins-bad/sys/va/gstvavpp.c
View file

@ -893,14 +893,17 @@ gst_va_vpp_transform_caps (GstBaseTransform * trans, GstPadDirection direction,
ret = gst_va_vpp_caps_remove_fields (caps); ret = gst_va_vpp_caps_remove_fields (caps);
tmp = gst_va_vpp_complete_caps_features (ret, GST_CAPS_FEATURE_MEMORY_VA); tmp = gst_va_vpp_complete_caps_features (ret, GST_CAPS_FEATURE_MEMORY_VA);
ret = gst_caps_merge (ret, tmp); if (!gst_caps_is_subset (tmp, ret))
gst_caps_append (ret, tmp);
tmp = gst_va_vpp_complete_caps_features (ret, GST_CAPS_FEATURE_MEMORY_DMABUF); tmp = gst_va_vpp_complete_caps_features (ret, GST_CAPS_FEATURE_MEMORY_DMABUF);
ret = gst_caps_merge (ret, tmp); if (!gst_caps_is_subset (tmp, ret))
gst_caps_append (ret, tmp);
tmp = gst_va_vpp_complete_caps_features (ret, tmp = gst_va_vpp_complete_caps_features (ret,
GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY); GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
ret = gst_caps_merge (ret, tmp); if (!gst_caps_is_subset (tmp, ret))
gst_caps_append (ret, tmp);
if (filter) { if (filter) {
GstCaps *intersection; GstCaps *intersection;