mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 13:55:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

[853/906] display: remove _{set,get}_context

Browse source 
A GstGLDisplay doesn't need a GstGLContext and its use
was cause a reference cycle
This commit is contained in:
Matthew Waters 2013-10-24 22:30:45 +11:00
parent 79260ff8f9
commit 636d307715
7 changed files with 0 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gst-libs/gst/gl/gstgldisplay.c
View file

@ -103,46 +103,6 @@ gst_gl_display_get_gl_api (GstGLDisplay * display)
return gst_gl_context_get_gl_api (display->context);
}
void
gst_gl_display_set_context (GstGLDisplay * display, GstGLContext * context)
{
g_return_if_fail (GST_IS_GL_DISPLAY (display));
g_return_if_fail (GST_GL_IS_CONTEXT (context));
gst_gl_display_lock (display);
if (display->context)
gst_object_unref (display->context);
display->context = gst_object_ref (context);
gst_gl_display_unlock (display);
}
GstGLContext *
gst_gl_display_get_context (GstGLDisplay * display)
{
GstGLContext *context;
g_return_val_if_fail (GST_IS_GL_DISPLAY (display), NULL);
gst_gl_display_lock (display);
context = display->context ? gst_object_ref (display->context) : NULL;
gst_gl_display_unlock (display);
return context;
}
GstGLContext *
gst_gl_display_get_context_unlocked (GstGLDisplay * display)
{
g_return_val_if_fail (GST_IS_GL_DISPLAY (display), NULL);
return display->context ? gst_object_ref (display->context) : NULL;
}
void
gst_context_set_gl_display (GstContext * context, GstGLDisplay * display)
{

3
gst-libs/gst/gl/gstgldisplay.h
View file

@ -68,9 +68,6 @@ GstGLDisplay *gst_gl_display_new (void);
GstGLAPI gst_gl_display_get_gl_api (GstGLDisplay * display);
gpointer gst_gl_display_get_gl_vtable (GstGLDisplay * display);
void gst_gl_display_set_context (GstGLDisplay * display, GstGLContext * context);
GstGLContext * gst_gl_display_get_context (GstGLDisplay * display);
GstGLContext * gst_gl_display_get_context_unlocked (GstGLDisplay * display);
#define GST_GL_DISPLAY_CONTEXT_TYPE "gst.gl.GLDisplay"
void gst_context_set_gl_display (GstContext * context, GstGLDisplay * display);

1
gst-libs/gst/gl/gstglmixer.c
View file

@ -965,7 +965,6 @@ gst_gl_mixer_activate (GstGLMixer * mix, gboolean activate)
GST_INFO ("Creating GstGLDisplay");
mix->context = gst_gl_context_new (mix->display);
gst_gl_display_set_context (mix->display, mix->context);
if (!gst_gl_context_create (mix->context, 0, &error)) {
GST_ELEMENT_ERROR (mix, RESOURCE, NOT_FOUND,

2
gst/gl/gstglimagesink.c
View file

@ -459,8 +459,6 @@ gst_glimage_sink_change_state (GstElement * element, GstStateChange transition)
return GST_STATE_CHANGE_FAILURE;
glimage_sink->context = gst_gl_context_new (glimage_sink->display);
gst_gl_display_set_context (glimage_sink->display,
glimage_sink->context);
window = gst_gl_context_get_window (glimage_sink->context);
if (!glimage_sink->window_id && !glimage_sink->new_window_id)

1
gst/gl/gstgltestsrc.c
View file

@ -585,7 +585,6 @@ gst_gl_test_src_start (GstBaseSrc * basesrc)
GST_INFO ("Creating GstGLDisplay");
src->context = gst_gl_context_new (src->display);
gst_gl_display_set_context (src->display, src->context);
if (!gst_gl_context_create (src->context, 0, &error)) {
GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND,

1
tests/check/libs/gstglcontext.c
View file

@ -233,7 +233,6 @@ GST_START_TEST (test_share)
display = gst_gl_display_new ();
context = gst_gl_context_new (display);
gst_gl_display_set_context (display, context);
window = gst_gl_window_new (display);
gst_gl_context_set_window (context, window);

1
tests/check/libs/gstglmemory.c
View file

@ -38,7 +38,6 @@ setup (void)
{
display = gst_gl_display_new ();
context = gst_gl_context_new (display);
gst_gl_display_set_context (display, context);
gst_gl_context_create (context, 0, NULL);
gst_gl_memory_init ();
}