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

gl/display/egl: ensure debug category is initialized

Browse Source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/662>
This commit is contained in:
Matthew Waters 2020-05-14 14:00:22 +10:00
parent 4e7d3b42ec
commit d0de7cba48
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gst-libs/gst/gl/egl/gstgldisplay_egl.c
View File

@ -41,8 +41,8 @@
#include "gsteglimage.h" #include "gsteglimage.h"
#include "gstglmemoryegl.h" #include "gstglmemoryegl.h"
GST_DEBUG_CATEGORY_STATIC (gst_gl_display_debug); GST_DEBUG_CATEGORY_STATIC (gst_gl_display_egl_debug);
#define GST_CAT_DEFAULT gst_gl_display_debug #define GST_CAT_DEFAULT gst_gl_display_egl_debug
#ifndef EGL_PLATFORM_X11 #ifndef EGL_PLATFORM_X11
#define EGL_PLATFORM_X11 0x31D5 #define EGL_PLATFORM_X11 0x31D5
@ -72,6 +72,18 @@ static void gst_gl_display_egl_finalize (GObject * object);
static guintptr gst_gl_display_egl_get_handle (GstGLDisplay * display); static guintptr gst_gl_display_egl_get_handle (GstGLDisplay * display);
static gboolean gst_gl_display_egl_get_foreign_display (GstGLDisplay * display); static gboolean gst_gl_display_egl_get_foreign_display (GstGLDisplay * display);
static void
init_debug (void)
{
static volatile gsize _init = 0;
if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gldisplayegl", 0,
"OpenGL EGL Display");
g_once_init_leave (&_init, 1);
}
}
static void static void
gst_gl_display_egl_class_init (GstGLDisplayEGLClass * klass) gst_gl_display_egl_class_init (GstGLDisplayEGLClass * klass)
{ {
@ -131,7 +143,7 @@ gst_gl_display_egl_get_from_native (GstGLDisplayType type, guintptr display)
g_return_val_if_fail ((type != GST_GL_DISPLAY_TYPE_ANY && display != 0) g_return_val_if_fail ((type != GST_GL_DISPLAY_TYPE_ANY && display != 0)
|| (type == GST_GL_DISPLAY_TYPE_ANY && display == 0), EGL_NO_DISPLAY); || (type == GST_GL_DISPLAY_TYPE_ANY && display == 0), EGL_NO_DISPLAY);
GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay"); init_debug ();
/* given an EGLDisplay already */ /* given an EGLDisplay already */
if (type == GST_GL_DISPLAY_TYPE_EGL) if (type == GST_GL_DISPLAY_TYPE_EGL)
@ -246,7 +258,7 @@ gst_gl_display_egl_new (void)
{ {
GstGLDisplayEGL *ret; GstGLDisplayEGL *ret;
GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay"); init_debug ();
ret = g_object_new (GST_TYPE_GL_DISPLAY_EGL, NULL); ret = g_object_new (GST_TYPE_GL_DISPLAY_EGL, NULL);
gst_object_ref_sink (ret); gst_object_ref_sink (ret);
@ -277,7 +289,7 @@ gst_gl_display_egl_new_with_egl_display (gpointer display)
g_return_val_if_fail (display != NULL, NULL); g_return_val_if_fail (display != NULL, NULL);
GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay"); init_debug ();
ret = g_object_new (GST_TYPE_GL_DISPLAY_EGL, NULL); ret = g_object_new (GST_TYPE_GL_DISPLAY_EGL, NULL);
gst_object_ref_sink (ret); gst_object_ref_sink (ret);
@ -319,7 +331,7 @@ gst_gl_display_egl_from_gl_display (GstGLDisplay * display)
g_return_val_if_fail (GST_IS_GL_DISPLAY (display), NULL); g_return_val_if_fail (GST_IS_GL_DISPLAY (display), NULL);
GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay"); init_debug ();
if (GST_IS_GL_DISPLAY_EGL (display)) { if (GST_IS_GL_DISPLAY_EGL (display)) {
GST_LOG_OBJECT (display, "display %" GST_PTR_FORMAT "is already a " GST_LOG_OBJECT (display, "display %" GST_PTR_FORMAT "is already a "