mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 11:41:09 +00:00
glupload: make meta upload manner only consider TextureUploadMeta feature
The current _upload_meta_upload_transform_caps() only simply apply "memory:GLMemory" to all input caps to transform the output caps. This is not precise and may cause problem. For example, if the input caps include: video/x-raw(memory:DMABuf), width=(int)1920, height=(int)1080, \ interlace-mode=(string)progressive, multiview-mode=(string)mono, \ framerate=(fraction)30/1, drm-format=(string)NV12:0x0100000000000002 it will be changed as video/x-raw(memory:GLMemory), width=(int)1920, height=(int)1080, \ interlace-mode=(string)progressive, multiview-mode=(string)mono, \ framerate=(fraction)30/1, drm-format=(string)NV12:0x0100000000000002 For GLMemory kind caps, no drm-format should appear. So we should let it only transforms which it can recognize. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3524>
This commit is contained in:
parent
fe07763fd8
commit
414f91d0fa
1 changed files with 12 additions and 2 deletions
|
@ -1784,14 +1784,24 @@ _upload_meta_upload_transform_caps (gpointer impl, GstGLContext * context,
|
||||||
GstCapsFeatures *passthrough =
|
GstCapsFeatures *passthrough =
|
||||||
gst_caps_features_from_string
|
gst_caps_features_from_string
|
||||||
(GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
|
(GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
|
||||||
|
GstCapsFeatures *filter_features;
|
||||||
GstCaps *ret;
|
GstCaps *ret;
|
||||||
|
|
||||||
if (direction == GST_PAD_SINK) {
|
if (direction == GST_PAD_SINK) {
|
||||||
GstCaps *tmp;
|
GstCaps *tmp;
|
||||||
|
|
||||||
ret =
|
filter_features = gst_caps_features_from_string
|
||||||
_set_caps_features_with_passthrough (caps,
|
(GST_CAPS_FEATURE_META_GST_VIDEO_GL_TEXTURE_UPLOAD_META);
|
||||||
|
if (!_filter_caps_with_features (caps, filter_features, &tmp)) {
|
||||||
|
gst_caps_features_free (filter_features);
|
||||||
|
gst_caps_features_free (passthrough);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
gst_caps_features_free (filter_features);
|
||||||
|
|
||||||
|
ret = _set_caps_features_with_passthrough (tmp,
|
||||||
GST_CAPS_FEATURE_MEMORY_GL_MEMORY, passthrough);
|
GST_CAPS_FEATURE_MEMORY_GL_MEMORY, passthrough);
|
||||||
|
gst_caps_unref (tmp);
|
||||||
|
|
||||||
tmp = _caps_intersect_texture_target (ret, 1 << GST_GL_TEXTURE_TARGET_2D);
|
tmp = _caps_intersect_texture_target (ret, 1 << GST_GL_TEXTURE_TARGET_2D);
|
||||||
gst_caps_unref (ret);
|
gst_caps_unref (ret);
|
||||||
|
|
Loading…
Reference in a new issue