Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
ximage: allow per feature registration
  • Loading branch information
Stéphane Cerveau committed Mar 29, 2021
1 parent a176f1a commit fa416b0
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 18 deletions.
16 changes: 1 addition & 15 deletions sys/ximage/ximage.c
Expand Up @@ -23,25 +23,11 @@

#include "ximagesink.h"

GST_DEBUG_CATEGORY (gst_debug_x_image_pool);
GST_DEBUG_CATEGORY (gst_debug_x_image_sink);
GST_DEBUG_CATEGORY (CAT_PERFORMANCE);

static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "ximagesink",
GST_RANK_SECONDARY, GST_TYPE_X_IMAGE_SINK))
return FALSE;

GST_DEBUG_CATEGORY_INIT (gst_debug_x_image_sink, "ximagesink", 0,
"ximagesink element");
GST_DEBUG_CATEGORY_INIT (gst_debug_x_image_pool, "ximagepool", 0,
"ximagepool object");

GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE");

return TRUE;
return GST_ELEMENT_REGISTER (ximagesink, plugin);
}

GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
Expand Down
2 changes: 1 addition & 1 deletion sys/ximage/ximagepool.c
Expand Up @@ -32,7 +32,7 @@
#include <gst/video/gstvideometa.h>
#include <gst/video/gstvideopool.h>

GST_DEBUG_CATEGORY_EXTERN (gst_debug_x_image_pool);
GST_DEBUG_CATEGORY (gst_debug_x_image_pool);
#define GST_CAT_DEFAULT gst_debug_x_image_pool

/* X11 stuff */
Expand Down
13 changes: 11 additions & 2 deletions sys/ximage/ximagesink.c
Expand Up @@ -115,8 +115,10 @@
/* for XkbKeycodeToKeysym */
#include <X11/XKBlib.h>

GST_DEBUG_CATEGORY_EXTERN (gst_debug_x_image_sink);
GST_DEBUG_CATEGORY_EXTERN (CAT_PERFORMANCE);
GST_DEBUG_CATEGORY_EXTERN (gst_debug_x_image_pool);
GST_DEBUG_CATEGORY (gst_debug_x_image_sink);
GST_DEBUG_CATEGORY_STATIC (CAT_PERFORMANCE);

#define GST_CAT_DEFAULT gst_debug_x_image_sink

typedef struct
Expand Down Expand Up @@ -179,6 +181,13 @@ G_DEFINE_TYPE_WITH_CODE (GstXImageSink, gst_x_image_sink, GST_TYPE_VIDEO_SINK,
G_IMPLEMENT_INTERFACE (GST_TYPE_VIDEO_OVERLAY,
gst_x_image_sink_video_overlay_init));

#define _do_init \
GST_DEBUG_CATEGORY_INIT (gst_debug_x_image_sink, "ximagesink", 0, "ximagesink element");\
GST_DEBUG_CATEGORY_INIT (gst_debug_x_image_pool, "ximagepool", 0, "ximagepool object");\
GST_DEBUG_CATEGORY_GET (CAT_PERFORMANCE, "GST_PERFORMANCE");
GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (ximagesink, "ximagesink",
GST_RANK_SECONDARY, GST_TYPE_X_IMAGE_SINK, _do_init);

/* ============================================================= */
/* */
/* Private Methods */
Expand Down
1 change: 1 addition & 0 deletions sys/ximage/ximagesink.h
Expand Up @@ -208,6 +208,7 @@ struct _GstXImageSinkClass
};

GType gst_x_image_sink_get_type (void);
GST_ELEMENT_REGISTER_DECLARE (ximagesink);

G_END_DECLS
#endif /* __GST_X_IMAGE_SINK_H__ */

0 comments on commit fa416b0

Please sign in to comment.