Commit 7e207300 authored by Matthew Waters's avatar Matthew Waters 🐨 Committed by GStreamer Merge Bot

glbasefilter: add support for changing the display

Each element will remove its usage of the old display and context and
try to retrieve a new GL context.
parent 4e12363c
......@@ -36,15 +36,14 @@ G_DEFINE_TYPE_WITH_CODE (GstGLColorConvertElement, gst_gl_color_convert_element,
"glconvertelement", 0, "convert");
);
static gboolean gst_gl_color_convert_element_set_caps (GstBaseTransform * bt,
GstCaps * in_caps, GstCaps * out_caps);
static gboolean gst_gl_color_convert_element_gl_set_caps (GstGLBaseFilter *
base_filter, GstCaps * in_caps, GstCaps * out_caps);
static GstCaps *gst_gl_color_convert_element_transform_caps (GstBaseTransform *
bt, GstPadDirection direction, GstCaps * caps, GstCaps * filter);
static gboolean gst_gl_color_convert_element_get_unit_size (GstBaseTransform *
trans, GstCaps * caps, gsize * size);
static gboolean
gst_gl_color_convert_element_filter_meta (GstBaseTransform * trans,
GstQuery * query, GType api, const GstStructure * params);
static gboolean gst_gl_color_convert_element_filter_meta (GstBaseTransform *
trans, GstQuery * query, GType api, const GstStructure * params);
static gboolean gst_gl_color_convert_element_decide_allocation (GstBaseTransform
* trans, GstQuery * query);
static GstFlowReturn
......@@ -52,8 +51,8 @@ gst_gl_color_convert_element_prepare_output_buffer (GstBaseTransform * bt,
GstBuffer * inbuf, GstBuffer ** outbuf);
static GstFlowReturn gst_gl_color_convert_element_transform (GstBaseTransform *
bt, GstBuffer * inbuf, GstBuffer * outbuf);
static GstCaps *gst_gl_color_convert_element_fixate_caps (GstBaseTransform *
bt, GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
static GstCaps *gst_gl_color_convert_element_fixate_caps (GstBaseTransform * bt,
GstPadDirection direction, GstCaps * caps, GstCaps * othercaps);
static GstStateChangeReturn
gst_gl_color_convert_element_change_state (GstElement * element,
GstStateChange transition);
......@@ -70,34 +69,33 @@ GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_GL_COLOR_CONVERT_VIDEO_CAPS));
static gboolean
gst_gl_color_convert_element_stop (GstBaseTransform * bt)
static void
gst_gl_color_convert_element_gl_stop (GstGLBaseFilter * filter)
{
GstGLColorConvertElement *convert = GST_GL_COLOR_CONVERT_ELEMENT (bt);
GstGLColorConvertElement *convert = GST_GL_COLOR_CONVERT_ELEMENT (filter);
if (convert->convert) {
gst_object_unref (convert->convert);
convert->convert = NULL;
}
return GST_BASE_TRANSFORM_CLASS (parent_class)->stop (bt);
GST_GL_BASE_FILTER_CLASS (parent_class)->gl_stop (filter);
}
static void
gst_gl_color_convert_element_class_init (GstGLColorConvertElementClass * klass)
{
GstGLBaseFilterClass *filter_class = GST_GL_BASE_FILTER_CLASS (klass);
GstBaseTransformClass *bt_class = GST_BASE_TRANSFORM_CLASS (klass);
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
bt_class->transform_caps = gst_gl_color_convert_element_transform_caps;
bt_class->set_caps = gst_gl_color_convert_element_set_caps;
bt_class->get_unit_size = gst_gl_color_convert_element_get_unit_size;
bt_class->filter_meta = gst_gl_color_convert_element_filter_meta;
bt_class->decide_allocation = gst_gl_color_convert_element_decide_allocation;
bt_class->prepare_output_buffer =
gst_gl_color_convert_element_prepare_output_buffer;
bt_class->transform = gst_gl_color_convert_element_transform;
bt_class->stop = gst_gl_color_convert_element_stop;
bt_class->fixate_caps = gst_gl_color_convert_element_fixate_caps;
bt_class->passthrough_on_same_caps = TRUE;
......@@ -113,6 +111,9 @@ gst_gl_color_convert_element_class_init (GstGLColorConvertElementClass * klass)
"OpenGL color converter", "Filter/Converter/Video",
"Converts between color spaces using OpenGL shaders",
"Matthew Waters <matthew@centricular.com>");
filter_class->gl_stop = gst_gl_color_convert_element_gl_stop;
filter_class->gl_set_caps = gst_gl_color_convert_element_gl_set_caps;
}
static void
......@@ -123,10 +124,14 @@ gst_gl_color_convert_element_init (GstGLColorConvertElement * convert)
}
static gboolean
gst_gl_color_convert_element_set_caps (GstBaseTransform * bt,
gst_gl_color_convert_element_gl_set_caps (GstGLBaseFilter * base_filter,
GstCaps * in_caps, GstCaps * out_caps)
{
GstGLColorConvertElement *convert = GST_GL_COLOR_CONVERT_ELEMENT (bt);
GstGLColorConvertElement *convert =
GST_GL_COLOR_CONVERT_ELEMENT (base_filter);
if (!convert->convert && base_filter->context)
convert->convert = gst_gl_color_convert_new (base_filter->context);
if (!gst_gl_color_convert_set_caps (convert->convert, in_caps, out_caps))
return FALSE;
......@@ -141,16 +146,21 @@ gst_gl_color_convert_element_transform_caps (GstBaseTransform * bt,
GstGLColorConvertElement *convert = GST_GL_COLOR_CONVERT_ELEMENT (bt);
GstGLBaseFilter *base_filter = GST_GL_BASE_FILTER (bt);
GstGLContext *context;
GstCaps *ret;
if (base_filter->display && !gst_gl_base_filter_find_gl_context (base_filter))
return NULL;
context = GST_GL_BASE_FILTER (bt)->context;
context = gst_gl_base_filter_get_gl_context (base_filter);
if (!convert->convert && context)
convert->convert = gst_gl_color_convert_new (context);
return gst_gl_color_convert_transform_caps (context, direction, caps, filter);
ret = gst_gl_color_convert_transform_caps (context, direction, caps, filter);
gst_clear_object (&context);
return ret;
}
static gboolean
......
This diff is collapsed.
......@@ -70,6 +70,8 @@ struct _GstGLBaseFilter
* @gl_start: called in the GL thread to setup the element GL state.
* @gl_stop: called in the GL thread to setup the element GL state.
* @gl_set_caps: called in the GL thread when caps are set on @filter.
* Note: this will also be called when changing OpenGL contexts
* where #GstBaseTransform::set_caps may not.
*
* The base class for GStreamer GL Filter.
*/
......@@ -90,6 +92,8 @@ struct _GstGLBaseFilterClass
GST_GL_API
gboolean gst_gl_base_filter_find_gl_context (GstGLBaseFilter * filter);
GST_GL_API
GstGLContext * gst_gl_base_filter_get_gl_context (GstGLBaseFilter * filter);
G_END_DECLS
......
/* GStreamer
*
* Copyright (C) 2019 Matthew Waters <matthew@centricular.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gst/gst.h>
#include <gst/gl/gl.h>
#include <gst/check/gstcheck.h>
#include <gst/check/gstharness.h>
static void
replace_display (GstHarness * h)
{
GstContext *new_context;
GstGLDisplay *new_display;
GstGLContext *expected, *gl_context;
GstBuffer *buf;
/* replaces the GstGLDisplay used by @h with verification */
buf = gst_harness_create_buffer (h, 4);
buf = gst_harness_push_and_pull (h, buf);
fail_unless (buf != NULL);
gst_clear_buffer (&buf);
g_object_get (G_OBJECT (h->element), "context", &gl_context, NULL);
fail_unless (gl_context != NULL);
gst_clear_object (&gl_context);
new_display = gst_gl_display_new ();
fail_unless (gst_gl_display_create_context (new_display, NULL, &expected,
NULL));
fail_unless (expected != NULL);
gst_gl_display_add_context (new_display, expected);
new_context = gst_context_new (GST_GL_DISPLAY_CONTEXT_TYPE, TRUE);
gst_context_set_gl_display (new_context, new_display);
gst_element_set_context (h->element, new_context);
gst_context_unref (new_context);
new_context = NULL;
buf = gst_harness_create_buffer (h, 4);
buf = gst_harness_push_and_pull (h, buf);
fail_unless (buf != NULL);
gst_clear_buffer (&buf);
g_object_get (G_OBJECT (h->element), "context", &gl_context, NULL);
fail_unless (gl_context != NULL);
fail_unless (gl_context == expected);
fail_unless (new_display == gl_context->display);
gst_object_unref (expected);
gst_object_unref (gl_context);
gst_object_unref (new_display);
}
GST_START_TEST (test_glupload_display_replace)
{
GstHarness *upload;
upload = gst_harness_new ("glupload");
gst_harness_set_caps_str (upload, "video/x-raw,format=RGBA,width=1,height=1",
"video/x-raw(memory:GLMemory),format=RGBA,width=1,height=1");
replace_display (upload);
gst_harness_teardown (upload);
}
GST_END_TEST;
GST_START_TEST (test_glcolorconvert_display_replace)
{
GstHarness *convert;
convert = gst_harness_new ("glcolorconvert");
gst_harness_set_caps_str (convert,
"video/x-raw(memory:GLMemory),format=RGBA,width=1,height=1,texture-target=2D",
"video/x-raw(memory:GLMemory),format=RGBA,width=1,height=1,texture-target=2D");
replace_display (convert);
gst_harness_teardown (convert);
}
GST_END_TEST;
static Suite *
glfilter_suite (void)
{
Suite *s = suite_create ("glfilter");
TCase *tc = tcase_create ("general");
tcase_add_test (tc, test_glupload_display_replace);
tcase_add_test (tc, test_glcolorconvert_display_replace);
suite_add_tcase (s, tc);
return s;
}
int
main (int argc, char **argv)
{
Suite *s;
g_setenv ("GST_GL_XINITTHREADS", "1", TRUE);
gst_check_init (&argc, &argv);
s = glfilter_suite ();
return gst_check_run_suite (s, "glfilter", __FILE__);
}
......@@ -100,6 +100,7 @@ if build_gstgl and host_machine.system() != 'windows'
[ 'elements/glimagesink.c', not build_gstgl, [gstgl_dep]],
[ 'elements/glbin.c', not build_gstgl ],
[ 'pipelines/gl-launch-lines.c', not build_gstgl ],
[ 'elements/glfilter.c', not build_gstgl, [gstgl_dep]],
]
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment