FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

glupload: Add raw caps to sink pad when needed.

Browse Source 
When checking if the current upload method can support
the requested caps filter in _transform_caps(),
make sure the sink pad reports raw caps.

Fixes #1311

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2725>
This commit is contained in:
Jan Schmidt 2022-07-07 23:40:22 +10:00 committed by GStreamer Marge Bot
parent f8541b05aa
commit 3511be9a05
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
subprojects/gst-plugins-base/gst-libs/gst/gl/gstglupload.c
View File

@ -192,6 +192,7 @@ _caps_intersect_texture_target (GstCaps * caps, GstGLTextureTarget target_mask)
typedef enum typedef enum
{ {
METHOD_FLAG_CAN_SHARE_CONTEXT = 1, METHOD_FLAG_CAN_SHARE_CONTEXT = 1,
METHOD_FLAG_CAN_ACCEPT_RAW = 2, /* This method can accept raw memory input caps */
} GstGLUploadMethodFlags; } GstGLUploadMethodFlags;
struct _UploadMethod struct _UploadMethod
@ -827,7 +828,7 @@ _dma_buf_upload_free (gpointer impl)
static const UploadMethod _dma_buf_upload = { static const UploadMethod _dma_buf_upload = {
"Dmabuf", "Dmabuf",
0, METHOD_FLAG_CAN_ACCEPT_RAW,
&_dma_buf_upload_caps, &_dma_buf_upload_caps,
&_dma_buf_upload_new, &_dma_buf_upload_new,
&_dma_buf_upload_transform_caps, &_dma_buf_upload_transform_caps,
@ -2229,7 +2230,9 @@ static const UploadMethod *upload_methods[] = { &_gl_memory_upload,
#if defined(HAVE_NVMM) #if defined(HAVE_NVMM)
&_nvmm_upload, &_nvmm_upload,
#endif /* HAVE_NVMM */ #endif /* HAVE_NVMM */
&_upload_meta_upload, &_raw_data_upload &_upload_meta_upload,
/* Raw data must always be last / least preferred */
&_raw_data_upload
}; };
static GMutex upload_global_lock; static GMutex upload_global_lock;
@ -2352,7 +2355,21 @@ gst_gl_upload_transform_caps (GstGLUpload * upload, GstGLContext * context,
if (upload->priv->method) { if (upload->priv->method) {
tmp = upload->priv->method->transform_caps (upload->priv->method_impl, tmp = upload->priv->method->transform_caps (upload->priv->method_impl,
context, direction, caps); context, direction, caps);
if (tmp) { if (tmp) {
/* If we're generating sink pad caps, make sure to include raw caps if needed by
* the current method */
if (direction == GST_PAD_SRC
&& (upload->priv->method->flags & METHOD_FLAG_CAN_ACCEPT_RAW)) {
GstCapsFeatures *passthrough =
gst_caps_features_from_string
(GST_CAPS_FEATURE_META_GST_VIDEO_OVERLAY_COMPOSITION);
GstCaps *raw_tmp = _set_caps_features_with_passthrough (tmp,
GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, passthrough);
gst_caps_append (tmp, raw_tmp);
gst_caps_features_free (passthrough);
}
if (filter) { if (filter) {
result = result =
gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST); gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);