Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
xvimage: allow per feature registration
  • Loading branch information
Stéphane Cerveau committed Mar 29, 2021
1 parent fa416b0 commit 141b8c4
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 18 deletions.
2 changes: 1 addition & 1 deletion sys/xvimage/xvcontext.c
Expand Up @@ -33,7 +33,7 @@
/* for XkbKeycodeToKeysym */
#include <X11/XKBlib.h>

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

void
Expand Down
16 changes: 1 addition & 15 deletions sys/xvimage/xvimage.c
Expand Up @@ -23,25 +23,11 @@

#include "xvimagesink.h"

GST_DEBUG_CATEGORY (gst_debug_xv_context);
GST_DEBUG_CATEGORY (gst_debug_xv_image_pool);
GST_DEBUG_CATEGORY (gst_debug_xv_image_sink);

static gboolean
plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "xvimagesink",
GST_RANK_PRIMARY, GST_TYPE_XV_IMAGE_SINK))
return FALSE;

GST_DEBUG_CATEGORY_INIT (gst_debug_xv_context, "xcontext", 0,
"xcontext miniobject");
GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_sink, "xvimagesink", 0,
"xvimagesink element");
GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_pool, "xvimagepool", 0,
"xvimagepool object");

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

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


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

/* bufferpool */
Expand Down
11 changes: 10 additions & 1 deletion sys/xvimage/xvimagesink.c
Expand Up @@ -132,7 +132,10 @@
/* for XkbKeycodeToKeysym */
#include <X11/XKBlib.h>

GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_image_sink);
GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_context);
GST_DEBUG_CATEGORY_EXTERN (gst_debug_xv_image_pool);
GST_DEBUG_CATEGORY (gst_debug_xv_image_sink);

#define GST_CAT_DEFAULT gst_debug_xv_image_sink
GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);

Expand Down Expand Up @@ -213,7 +216,13 @@ G_DEFINE_TYPE_WITH_CODE (GstXvImageSink, gst_xv_image_sink, GST_TYPE_VIDEO_SINK,
gst_xv_image_sink_video_overlay_init);
G_IMPLEMENT_INTERFACE (GST_TYPE_COLOR_BALANCE,
gst_xv_image_sink_colorbalance_init));
#define _do_init \
GST_DEBUG_CATEGORY_INIT (gst_debug_xv_context, "xcontext", 0, "xcontext miniobject");\
GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_sink, "xvimagesink", 0, "ximagesink element");\
GST_DEBUG_CATEGORY_INIT (gst_debug_xv_image_pool, "xvimagepool", 0, "ximagepool object");\

GST_ELEMENT_REGISTER_DEFINE_WITH_CODE (xvimagesink, "xvimagesink",
GST_RANK_PRIMARY, GST_TYPE_XV_IMAGE_SINK, _do_init);

/* ============================================================= */
/* */
Expand Down
1 change: 1 addition & 0 deletions sys/xvimage/xvimagesink.h
Expand Up @@ -132,6 +132,7 @@ struct _GstXvImageSinkClass
};

GType gst_xv_image_sink_get_type (void);
GST_ELEMENT_REGISTER_DECLARE (xvimagesink);

G_END_DECLS
#endif /* __GST_XV_IMAGE_SINK_H__ */

0 comments on commit 141b8c4

Please sign in to comment.