From 0806de5c753f7a193c0e3b522afd97302f4e7ce9 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Sat, 18 Oct 2014 10:03:43 +0200 Subject: [PATCH] glbufferpool: add the GstVideoGLTextureUploadMeta buffer pool option --- ext/gl/gstglmixer.c | 2 ++ ext/gl/gstgltestsrc.c | 2 ++ gst-libs/gst/gl/gstglbufferpool.c | 9 +++++++-- gst-libs/gst/gl/gstglfilter.c | 6 ++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ext/gl/gstglmixer.c b/ext/gl/gstglmixer.c index 37aa8f0..fba4407 100644 --- a/ext/gl/gstglmixer.c +++ b/ext/gl/gstglmixer.c @@ -822,6 +822,8 @@ gst_gl_mixer_decide_allocation (GstGLMixer * mix, GstQuery * query) gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META); + gst_buffer_pool_config_add_option (config, + GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META); gst_buffer_pool_set_config (pool, config); diff --git a/ext/gl/gstgltestsrc.c b/ext/gl/gstgltestsrc.c index 2b73b18..e763503 100644 --- a/ext/gl/gstgltestsrc.c +++ b/ext/gl/gstgltestsrc.c @@ -857,6 +857,8 @@ gst_gl_test_src_decide_allocation (GstBaseSrc * basesrc, GstQuery * query) config = gst_buffer_pool_get_config (pool); gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META); + gst_buffer_pool_config_add_option (config, + GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META); gst_buffer_pool_set_config (pool, config); if (update_pool) diff --git a/gst-libs/gst/gl/gstglbufferpool.c b/gst-libs/gst/gl/gstglbufferpool.c index 88604b7..dd46dca 100644 --- a/gst-libs/gst/gl/gstglbufferpool.c +++ b/gst-libs/gst/gl/gstglbufferpool.c @@ -51,6 +51,7 @@ struct _GstGLBufferPoolPrivate gint im_format; GstVideoInfo info; gboolean add_videometa; + gboolean add_uploadmeta; gboolean want_eglimage; GstBuffer *last_buffer; }; @@ -71,7 +72,8 @@ G_DEFINE_TYPE_WITH_CODE (GstGLBufferPool, gst_gl_buffer_pool, static const gchar ** gst_gl_buffer_pool_get_options (GstBufferPool * pool) { - static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, NULL + static const gchar *options[] = { GST_BUFFER_POOL_OPTION_VIDEO_META, + GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META, NULL }; return options; @@ -128,6 +130,8 @@ gst_gl_buffer_pool_set_config (GstBufferPool * pool, GstStructure * config) priv->add_videometa = gst_buffer_pool_config_has_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META); + priv->add_uploadmeta = gst_buffer_pool_config_has_option (config, + GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META); #if GST_GL_HAVE_PLATFORM_EGL g_assert (priv->allocator != NULL); @@ -217,7 +221,8 @@ gst_gl_buffer_pool_alloc (GstBufferPool * pool, GstBuffer ** buffer, if (!gst_gl_memory_setup_buffer (glpool->context, info, buf)) goto mem_create_failed; - gst_gl_upload_meta_add_to_buffer (glpool->upload, buf); + if (priv->add_uploadmeta) + gst_gl_upload_meta_add_to_buffer (glpool->upload, buf); *buffer = buf; diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c index a725fe2..83d9266 100644 --- a/gst-libs/gst/gl/gstglfilter.c +++ b/gst-libs/gst/gl/gstglfilter.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#include + #include "gstglfilter.h" #if GST_GL_HAVE_PLATFORM_EGL @@ -1130,8 +1132,12 @@ gst_gl_filter_decide_allocation (GstBaseTransform * trans, GstQuery * query) pool = gst_gl_buffer_pool_new (filter->context); config = gst_buffer_pool_get_config (pool); + gst_buffer_pool_config_set_params (config, caps, size, min, max); gst_buffer_pool_config_add_option (config, GST_BUFFER_POOL_OPTION_VIDEO_META); + gst_buffer_pool_config_add_option (config, + GST_BUFFER_POOL_OPTION_VIDEO_GL_TEXTURE_UPLOAD_META); + gst_buffer_pool_set_config (pool, config); if (filter->upload) { -- 2.7.4