Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix class helpers so that debug messages at level 5 work

  • Loading branch information...
commit a7824d610c0579602d1cddb477bde97cf16544b8 1 parent 7507b9c
@pedwo authored
View
3  gst/shvideo/gstshv4l2src.c
@@ -259,7 +259,6 @@ static void *capture_loop(void *data)
*/
static void gst_shv4l2src_init_class(gpointer g_class, gpointer data)
{
- GST_LOG("%s called", __func__);
parent_class = g_type_class_peek_parent(g_class);
gst_shv4l2src_class_init((GstSHV4L2SrcClass *) g_class);
}
@@ -276,7 +275,6 @@ static void gst_shv4l2src_base_init(gpointer klass)
"George A. Dorobantu <gdalex@gmail.com>");
GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
- GST_LOG("%s called", __func__);
gst_element_class_add_pad_template(element_class,
gst_static_pad_template_get(&src_factory));
gst_element_class_set_details(element_class, &plugin_details);
@@ -335,7 +333,6 @@ static void gst_shv4l2src_class_init(GstSHV4L2SrcClass * klass)
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
- GST_LOG("%s called", __func__);
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
View
3  gst/shvideo/gstshv4l2src.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_SHV4L2SRC, GstSHV4L2Src))
#define GST_SHV4L2SRC_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_SHV4L2SRC, GstSHV4L2Src))
+ (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_SHV4L2SRC, GstSHV4L2SrcClass))
#define GST_IS_SHV4L2SRC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_SHV4L2SRC))
@@ -42,7 +42,6 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_SHV4L2SRC))
typedef struct _GstSHV4L2Src GstSHV4L2Src;
-
typedef struct _GstSHV4L2SrcClass GstSHV4L2SrcClass;
View
8 gst/shvideo/gstshvideobuffer.h
@@ -32,11 +32,11 @@
#define GST_TYPE_SH_VIDEO_BUFFER (gst_sh_video_buffer_get_type())
#define GST_IS_SH_VIDEO_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SH_VIDEO_BUFFER))
#define GST_SH_VIDEO_BUFFER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SH_VIDEO_BUFFER, GstSHVideoBuffer))
-#define GST_SH_VIDEO_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_SH_VIDEO_BUFFER, GstSHVideoBufferclass))
+#define GST_SH_VIDEO_BUFFER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_SH_VIDEO_BUFFER, GstSHVideoBufferClass))
#define GST_SH_VIDEO_BUFFER_CAST(obj) ((GstSHVideoBuffer *)(obj))
typedef struct _GstSHVideoBuffer GstSHVideoBuffer;
-typedef struct _GstSHVideoBufferclass GstSHVideoBufferclass;
+typedef struct _GstSHVideoBufferClass GstSHVideoBufferClass;
/**
* \struct _GstSHVideoBuffer
@@ -54,10 +54,10 @@ struct _GstSHVideoBuffer
};
/**
- * \struct _GstSHVideoBufferclass
+ * \struct _GstSHVideoBufferClass
* \var parent Parent
*/
-struct _GstSHVideoBufferclass
+struct _GstSHVideoBufferClass
{
GstBufferClass parent;
};
View
12 gst/shvideo/gstshvideocapenc.c
@@ -91,15 +91,6 @@ struct _GstSHVideoCapEnc {
gboolean stop_encode_thr;
};
-
-/**
- * Define Gstreamer SH Video Encoder Class structure
- */
-struct _GstSHVideoCapEncClass {
- GstElementClass parent;
-};
-
-
/**
* \var enc_src_factory
* Name: src \n
@@ -301,7 +292,6 @@ gst_sh_video_enc_base_init(gpointer klass)
"Takashi Namiki <takashi.namiki@renesas.com>");
GstElementClass *element_class = GST_ELEMENT_CLASS(klass);
- GST_LOG("%s called", __func__);
gst_element_class_add_pad_template(element_class,
gst_static_pad_template_get(&enc_src_factory));
gst_element_class_set_details(element_class, &plugin_details);
@@ -407,8 +397,6 @@ gst_sh_video_enc_init(GstSHVideoCapEnc * enc, GstSHVideoCapEncClass * gklass)
{
GstElementClass *klass = GST_ELEMENT_GET_CLASS(enc);
- GST_LOG_OBJECT(enc, "%s called", __func__);
-
enc->srcpad = gst_pad_new_from_template(
gst_element_class_get_pad_template(klass, "src"), "src");
gst_pad_set_setcaps_function(enc->srcpad, gst_sh_video_enc_set_src_caps);
View
12 gst/shvideo/gstshvideocapenc.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
#define GST_SH_VIDEO_CAPENC(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SH_VIDEO_CAPENC,GstSHVideoCapEnc))
#define GST_SH_VIDEO_CAPENC_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SH_VIDEO_CAPENC,GstSHVideoCapEnc))
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SH_VIDEO_CAPENC,GstSHVideoCapEncClass))
#define GST_IS_SH_VIDEO_CAPENC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SH_VIDEO_CAPENC))
#define GST_IS_SH_VIDEO_CAPENC_CLASS(obj) \
@@ -40,7 +40,15 @@ G_BEGIN_DECLS
typedef struct _GstSHVideoCapEnc GstSHVideoCapEnc;
typedef struct _GstSHVideoCapEncClass GstSHVideoCapEncClass;
-
+/**
+ * GstSHVideoCapEncClass
+ * \struct _GstSHVideoCapEncClass
+ * \var parent Parent class
+ */
+struct _GstSHVideoCapEncClass
+{
+ GstElementClass parent;
+};
/** Get gst-sh-mobile-camera-enc object type
@return object type
View
2  gst/shvideo/gstshvideodec.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
#define GST_SH_VIDEO_DEC(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SH_VIDEO_DEC,GstSHVideoDec))
#define GST_SH_VIDEO_DEC_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SH_VIDEO_DEC,GstSHVideoDec))
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SH_VIDEO_DEC,GstSHVideoDecClass))
#define GST_IS_SH_VIDEO_DEC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SH_VIDEO_DEC))
#define GST_IS_SH_VIDEO_DEC_CLASS(obj) \
View
13 gst/shvideo/gstshvideoresize.c
@@ -431,6 +431,9 @@ static void gst_shvidresize_class_init(GstSHVidresizeClass *klass)
trans_class->prepare_output_buffer = GST_DEBUG_FUNCPTR(gst_shvidresize_prepare_output_buffer);
trans_class->passthrough_on_same_caps = TRUE;
parent_class = g_type_class_peek_parent (klass);
+
+ GST_DEBUG_CATEGORY_INIT(gst_shvidresize_debug,
+ "gst-sh-mobile-resize", 0, "SH Video Resize");
}
/*
@@ -438,13 +441,9 @@ static void gst_shvidresize_class_init(GstSHVidresizeClass *klass)
*/
static void gst_shvidresize_init (GstSHVidresize *vidresize)
{
- GST_LOG("begin");
-
// TODO add fail checks
vidresize->uiomux = uiomux_open();
vidresize->veu = shveu_open_named("VEU");
-
- GST_LOG("end");
}
/*
@@ -470,12 +469,6 @@ GType gst_shvidresize_get_type(void)
object_type = g_type_register_static(GST_TYPE_BASE_TRANSFORM,
"gst-sh-mobile-resize", &object_info, (GTypeFlags)0);
-
- /* Initialize GST_LOG for this object */
- GST_DEBUG_CATEGORY_INIT(gst_shvidresize_debug,
- "gst-sh-mobile-resize", 0, "SH Video Resize");
-
- GST_LOG("initialized get_type");
}
return object_type;
View
4 gst/shvideo/gstshvideosink.c
@@ -270,10 +270,6 @@ static GstFlowReturn gst_sh_video_sink_buffer_alloc (GstBaseSink *bsink,
guint64 offset, guint size,
GstCaps *caps, GstBuffer **buf);
-
-
-
-
GType
gst_sh_video_sink_get_type (void)
{
View
6 gst/shvideo/shvideomixer.c
@@ -138,9 +138,6 @@ gst_sh_videomixer_pad_class_init (GstSHVideoMixerPadClass * klass)
gobject_class->set_property = gst_sh_videomixer_pad_set_property;
gobject_class->get_property = gst_sh_videomixer_pad_get_property;
- GST_DEBUG_CATEGORY_INIT(gst_sh_video_mixer_debug, "gst-sh-mobile-mixer",
- 0, "SH Video Mixer");
-
g_object_class_install_property (gobject_class, PROP_PAD_ZORDER,
g_param_spec_uint ("zorder", "Z-Order", "Z Order of the picture",
0, 10000, DEFAULT_PAD_ZORDER,
@@ -458,6 +455,9 @@ gst_sh_videomixer_class_init (GstSHVideoMixerClass * klass)
/* Register the pad class */
(void) (GST_TYPE_SH_VIDEO_MIXER_PAD);
+
+ GST_DEBUG_CATEGORY_INIT(gst_sh_video_mixer_debug, "gst-sh-mobile-mixer",
+ 0, "SH Video Mixer");
}
static void
View
2  gst/shvideo/shvideomixerpad.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
#define GST_SH_VIDEO_MIXER_PAD(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SH_VIDEO_MIXER_PAD, GstSHVideoMixerPad))
#define GST_SH_VIDEO_MIXER_PAD_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SH_VIDEO_MIXER_PAD, GstSHVideoMixerPadiClass))
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SH_VIDEO_MIXER_PAD, GstSHVideoMixerPadClass))
#define GST_IS_VIDEO_MIXER_PAD(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SH_VIDEO_MIXER_PAD))
#define GST_IS_VIDEO_MIXER_PAD_CLASS(klass) \

0 comments on commit a7824d6

Please sign in to comment.
Something went wrong with that request. Please try again.