mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-23 02:01:12 +00:00
vapostproc: Append featured caps rather than merge.
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:
parent
718e83ed4c
commit
68379649db
1 changed files with 6 additions and 3 deletions
|
@ -893,14 +893,17 @@ gst_va_vpp_transform_caps (GstBaseTransform * trans, GstPadDirection direction,
|
|||
ret = gst_va_vpp_caps_remove_fields (caps);
|
||||
|
||||
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);
|
||||
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_SYSTEM_MEMORY);
|
||||
ret = gst_caps_merge (ret, tmp);
|
||||
if (!gst_caps_is_subset (tmp, ret))
|
||||
gst_caps_append (ret, tmp);
|
||||
|
||||
if (filter) {
|
||||
GstCaps *intersection;
|
||||
|
|
Loading…
Reference in a new issue