mimic: Rename functions/macros to match class names

This commit is contained in:
Olivier Crête 2009-10-12 18:36:58 -04:00
parent 63c509b13e
commit b8e86cc8ad
5 changed files with 87 additions and 89 deletions

View file

@ -62,19 +62,19 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
"height = (int) [16, 4096], " "width = (int) [16, 4096]") "height = (int) [16, 4096], " "width = (int) [16, 4096]")
); );
static void gst_mimdec_finalize (GObject * object); static void gst_mim_dec_finalize (GObject * object);
static GstFlowReturn gst_mimdec_chain (GstPad * pad, GstBuffer * in); static GstFlowReturn gst_mim_dec_chain (GstPad * pad, GstBuffer * in);
static GstStateChangeReturn static GstStateChangeReturn
gst_mimdec_change_state (GstElement * element, GstStateChange transition); gst_mim_dec_change_state (GstElement * element, GstStateChange transition);
static gboolean gst_mimdec_sink_event (GstPad * pad, GstEvent * event); static gboolean gst_mim_dec_sink_event (GstPad * pad, GstEvent * event);
GST_BOILERPLATE (GstMimDec, gst_mimdec, GstElement, GST_TYPE_ELEMENT); GST_BOILERPLATE (GstMimDec, gst_mim_dec, GstElement, GST_TYPE_ELEMENT);
static void static void
gst_mimdec_base_init (gpointer klass) gst_mim_dec_base_init (gpointer klass)
{ {
GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
@ -94,27 +94,27 @@ gst_mimdec_base_init (gpointer klass)
} }
static void static void
gst_mimdec_class_init (GstMimDecClass * klass) gst_mim_dec_class_init (GstMimDecClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
GstElementClass *gstelement_class; GstElementClass *gstelement_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass; gstelement_class = (GstElementClass *) klass;
gstelement_class->change_state = gst_mimdec_change_state; gstelement_class->change_state = gst_mim_dec_change_state;
gobject_class->finalize = gst_mimdec_finalize; gobject_class->finalize = gst_mim_dec_finalize;
GST_DEBUG_CATEGORY_INIT (mimdec_debug, "mimdec", 0, "Mimic decoder plugin"); GST_DEBUG_CATEGORY_INIT (mimdec_debug, "mimdec", 0, "Mimic decoder plugin");
} }
static void static void
gst_mimdec_init (GstMimDec * mimdec, GstMimDecClass * klass) gst_mim_dec_init (GstMimDec * mimdec, GstMimDecClass * klass)
{ {
mimdec->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink"); mimdec->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
gst_element_add_pad (GST_ELEMENT (mimdec), mimdec->sinkpad); gst_element_add_pad (GST_ELEMENT (mimdec), mimdec->sinkpad);
gst_pad_set_chain_function (mimdec->sinkpad, gst_mimdec_chain); gst_pad_set_chain_function (mimdec->sinkpad, gst_mim_dec_chain);
gst_pad_set_event_function (mimdec->sinkpad, gst_mimdec_sink_event); gst_pad_set_event_function (mimdec->sinkpad, gst_mim_dec_sink_event);
mimdec->srcpad = gst_pad_new_from_static_template (&src_factory, "src"); mimdec->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
gst_element_add_pad (GST_ELEMENT (mimdec), mimdec->srcpad); gst_element_add_pad (GST_ELEMENT (mimdec), mimdec->srcpad);
@ -130,9 +130,9 @@ gst_mimdec_init (GstMimDec * mimdec, GstMimDecClass * klass)
} }
static void static void
gst_mimdec_finalize (GObject * object) gst_mim_dec_finalize (GObject * object)
{ {
GstMimDec *mimdec = GST_MIMDEC (object); GstMimDec *mimdec = GST_MIM_DEC (object);
gst_adapter_clear (mimdec->adapter); gst_adapter_clear (mimdec->adapter);
g_object_unref (mimdec->adapter); g_object_unref (mimdec->adapter);
@ -141,7 +141,7 @@ gst_mimdec_finalize (GObject * object)
} }
static GstFlowReturn static GstFlowReturn
gst_mimdec_chain (GstPad * pad, GstBuffer * in) gst_mim_dec_chain (GstPad * pad, GstBuffer * in)
{ {
GstMimDec *mimdec; GstMimDec *mimdec;
GstBuffer *out_buf, *buf; GstBuffer *out_buf, *buf;
@ -155,12 +155,10 @@ gst_mimdec_chain (GstPad * pad, GstBuffer * in)
GstEvent *event = NULL; GstEvent *event = NULL;
gboolean result = TRUE; gboolean result = TRUE;
GST_DEBUG ("in gst_mimdec_chain");
g_return_val_if_fail (GST_IS_PAD (pad), GST_FLOW_ERROR); g_return_val_if_fail (GST_IS_PAD (pad), GST_FLOW_ERROR);
mimdec = GST_MIMDEC (gst_pad_get_parent (pad)); mimdec = GST_MIM_DEC (gst_pad_get_parent (pad));
g_return_val_if_fail (GST_IS_MIMDEC (mimdec), GST_FLOW_ERROR); g_return_val_if_fail (GST_IS_MIM_DEC (mimdec), GST_FLOW_ERROR);
buf = GST_BUFFER (in); buf = GST_BUFFER (in);
gst_adapter_push (mimdec->adapter, buf); gst_adapter_push (mimdec->adapter, buf);
@ -331,11 +329,11 @@ out:
} }
static GstStateChangeReturn static GstStateChangeReturn
gst_mimdec_change_state (GstElement * element, GstStateChange transition) gst_mim_dec_change_state (GstElement * element, GstStateChange transition)
{ {
GstMimDec *mimdec; GstMimDec *mimdec;
mimdec = GST_MIMDEC (element); mimdec = GST_MIM_DEC (element);
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
@ -363,10 +361,10 @@ gst_mimdec_change_state (GstElement * element, GstStateChange transition)
} }
static gboolean static gboolean
gst_mimdec_sink_event (GstPad * pad, GstEvent * event) gst_mim_dec_sink_event (GstPad * pad, GstEvent * event)
{ {
gboolean res = TRUE; gboolean res = TRUE;
GstMimDec *mimdec = GST_MIMDEC (gst_pad_get_parent (pad)); GstMimDec *mimdec = GST_MIM_DEC (gst_pad_get_parent (pad));
/* /*
* Ignore upstream newsegment event, its EVIL, we should implement * Ignore upstream newsegment event, its EVIL, we should implement

View file

@ -20,24 +20,24 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GST_MIMDEC_H__ #ifndef __GST_MIM_DEC_H__
#define __GST_MIMDEC_H__ #define __GST_MIM_DEC_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstadapter.h> #include <gst/base/gstadapter.h>
#include <mimic.h> #include <mimic.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_MIMDEC \ #define GST_TYPE_MIM_DEC \
(gst_mimdec_get_type()) (gst_mim_dec_get_type())
#define GST_MIMDEC(obj) \ #define GST_MIM_DEC(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MIMDEC,GstMimDec)) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MIM_DEC,GstMimDec))
#define GST_MIMDEC_CLASS(klass) \ #define GST_MIM_DEC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MIMDEC,GstMimDec)) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MIM_DEC,GstMimDec))
#define GST_IS_MIMDEC(obj) \ #define GST_IS_MIM_DEC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MIMDEC)) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MIM_DEC))
#define GST_IS_MIMDEC_CLASS(obj) \ #define GST_IS_MIM_DEC_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MIMDEC)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MIM_DEC))
typedef struct _GstMimDec GstMimDec; typedef struct _GstMimDec GstMimDec;
typedef struct _GstMimDecClass GstMimDecClass; typedef struct _GstMimDecClass GstMimDecClass;
@ -66,7 +66,7 @@ struct _GstMimDecClass
GstElementClass parent_class; GstElementClass parent_class;
}; };
GType gst_mimdec_get_type (void); GType gst_mim_dec_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_MIMDEC_H__ */ #endif /* __GST_MIM_DEC_H__ */

View file

@ -81,32 +81,32 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
); );
static gboolean gst_mimenc_setcaps (GstPad * pad, GstCaps * caps); static gboolean gst_mim_enc_setcaps (GstPad * pad, GstCaps * caps);
static GstFlowReturn gst_mimenc_chain (GstPad * pad, GstBuffer * in); static GstFlowReturn gst_mim_enc_chain (GstPad * pad, GstBuffer * in);
static GstBuffer *gst_mimenc_create_tcp_header (GstMimEnc * mimenc, static GstBuffer *gst_mim_enc_create_tcp_header (GstMimEnc * mimenc,
guint32 payload_size, GstClockTime timestamp, gboolean keyframe, guint32 payload_size, GstClockTime timestamp, gboolean keyframe,
gboolean paused); gboolean paused);
static gboolean gst_mimenc_event (GstPad * pad, GstEvent * event); static gboolean gst_mim_enc_event (GstPad * pad, GstEvent * event);
static GstStateChangeReturn static GstStateChangeReturn
gst_mimenc_change_state (GstElement * element, GstStateChange transition); gst_mim_enc_change_state (GstElement * element, GstStateChange transition);
static void gst_mimenc_set_property (GObject * object, guint prop_id, static void gst_mim_enc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_mimenc_get_property (GObject * object, guint prop_id, static void gst_mim_enc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec); GValue * value, GParamSpec * pspec);
GST_BOILERPLATE (GstMimEnc, gst_mimenc, GstElement, GST_TYPE_ELEMENT); GST_BOILERPLATE (GstMimEnc, gst_mim_enc, GstElement, GST_TYPE_ELEMENT);
static void static void
gst_mimenc_base_init (gpointer klass) gst_mim_enc_base_init (gpointer klass)
{ {
GstElementClass *element_class = GST_ELEMENT_CLASS (klass); GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->set_property = gst_mimenc_set_property; gobject_class->set_property = gst_mim_enc_set_property;
gobject_class->get_property = gst_mimenc_get_property; gobject_class->get_property = gst_mim_enc_get_property;
g_object_class_install_property (gobject_class, PROP_PAUSED_MODE, g_object_class_install_property (gobject_class, PROP_PAUSED_MODE,
g_param_spec_boolean ("paused-mode", "Paused mode", g_param_spec_boolean ("paused-mode", "Paused mode",
@ -124,26 +124,26 @@ gst_mimenc_base_init (gpointer klass)
} }
static void static void
gst_mimenc_class_init (GstMimEncClass * klass) gst_mim_enc_class_init (GstMimEncClass * klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
GstElementClass *gstelement_class; GstElementClass *gstelement_class;
gobject_class = (GObjectClass *) klass; gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass; gstelement_class = (GstElementClass *) klass;
gstelement_class->change_state = gst_mimenc_change_state; gstelement_class->change_state = gst_mim_enc_change_state;
GST_DEBUG_CATEGORY_INIT (mimenc_debug, "mimenc", 0, "Mimic encoder plugin"); GST_DEBUG_CATEGORY_INIT (mimenc_debug, "mimenc", 0, "Mimic encoder plugin");
} }
static void static void
gst_mimenc_init (GstMimEnc * mimenc, GstMimEncClass * klass) gst_mim_enc_init (GstMimEnc * mimenc, GstMimEncClass * klass)
{ {
mimenc->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink"); mimenc->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink");
gst_element_add_pad (GST_ELEMENT (mimenc), mimenc->sinkpad); gst_element_add_pad (GST_ELEMENT (mimenc), mimenc->sinkpad);
gst_pad_set_setcaps_function (mimenc->sinkpad, gst_mimenc_setcaps); gst_pad_set_setcaps_function (mimenc->sinkpad, gst_mim_enc_setcaps);
gst_pad_set_chain_function (mimenc->sinkpad, gst_mimenc_chain); gst_pad_set_chain_function (mimenc->sinkpad, gst_mim_enc_chain);
gst_pad_set_event_function (mimenc->sinkpad, gst_mimenc_event); gst_pad_set_event_function (mimenc->sinkpad, gst_mim_enc_event);
mimenc->srcpad = gst_pad_new_from_static_template (&src_factory, "src"); mimenc->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
gst_element_add_pad (GST_ELEMENT (mimenc), mimenc->srcpad); gst_element_add_pad (GST_ELEMENT (mimenc), mimenc->srcpad);
@ -160,10 +160,10 @@ gst_mimenc_init (GstMimEnc * mimenc, GstMimEncClass * klass)
} }
static void static void
gst_mimenc_set_property (GObject * object, guint prop_id, gst_mim_enc_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec) const GValue * value, GParamSpec * pspec)
{ {
GstMimEnc *mimenc = GST_MIMENC (object); GstMimEnc *mimenc = GST_MIM_ENC (object);
switch (prop_id) { switch (prop_id) {
case PROP_PAUSED_MODE: case PROP_PAUSED_MODE:
@ -178,10 +178,10 @@ gst_mimenc_set_property (GObject * object, guint prop_id,
} }
static void static void
gst_mimenc_get_property (GObject * object, guint prop_id, gst_mim_enc_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec) GValue * value, GParamSpec * pspec)
{ {
GstMimEnc *mimenc = GST_MIMENC (object); GstMimEnc *mimenc = GST_MIM_ENC (object);
switch (prop_id) { switch (prop_id) {
case PROP_PAUSED_MODE: case PROP_PAUSED_MODE:
@ -196,15 +196,15 @@ gst_mimenc_get_property (GObject * object, guint prop_id,
} }
static gboolean static gboolean
gst_mimenc_setcaps (GstPad * pad, GstCaps * caps) gst_mim_enc_setcaps (GstPad * pad, GstCaps * caps)
{ {
GstMimEnc *filter; GstMimEnc *filter;
GstStructure *structure; GstStructure *structure;
int ret = TRUE, height, width; int ret = TRUE, height, width;
filter = GST_MIMENC (gst_pad_get_parent (pad)); filter = GST_MIM_ENC (gst_pad_get_parent (pad));
g_return_val_if_fail (filter != NULL, FALSE); g_return_val_if_fail (filter != NULL, FALSE);
g_return_val_if_fail (GST_IS_MIMENC (filter), FALSE); g_return_val_if_fail (GST_IS_MIM_ENC (filter), FALSE);
structure = gst_caps_get_structure (caps, 0); structure = gst_caps_get_structure (caps, 0);
ret = gst_structure_get_int (structure, "width", &width); ret = gst_structure_get_int (structure, "width", &width);
@ -244,7 +244,7 @@ out:
} }
static GstFlowReturn static GstFlowReturn
gst_mimenc_chain (GstPad * pad, GstBuffer * in) gst_mim_enc_chain (GstPad * pad, GstBuffer * in)
{ {
GstMimEnc *mimenc; GstMimEnc *mimenc;
GstBuffer *out_buf = NULL, *buf = NULL; GstBuffer *out_buf = NULL, *buf = NULL;
@ -256,9 +256,9 @@ gst_mimenc_chain (GstPad * pad, GstBuffer * in)
gboolean keyframe; gboolean keyframe;
g_return_val_if_fail (GST_IS_PAD (pad), GST_FLOW_ERROR); g_return_val_if_fail (GST_IS_PAD (pad), GST_FLOW_ERROR);
mimenc = GST_MIMENC (gst_pad_get_parent (pad)); mimenc = GST_MIM_ENC (gst_pad_get_parent (pad));
g_return_val_if_fail (GST_IS_MIMENC (mimenc), GST_FLOW_ERROR); g_return_val_if_fail (GST_IS_MIM_ENC (mimenc), GST_FLOW_ERROR);
GST_OBJECT_LOCK (mimenc); GST_OBJECT_LOCK (mimenc);
@ -320,7 +320,7 @@ gst_mimenc_chain (GstPad * pad, GstBuffer * in)
++mimenc->frames; ++mimenc->frames;
// now let's create that tcp header // now let's create that tcp header
header = gst_mimenc_create_tcp_header (mimenc, buffer_size, header = gst_mim_enc_create_tcp_header (mimenc, buffer_size,
GST_BUFFER_TIMESTAMP (out_buf), keyframe, FALSE); GST_BUFFER_TIMESTAMP (out_buf), keyframe, FALSE);
if (!header) { if (!header) {
@ -364,7 +364,7 @@ out_unlock:
} }
static GstBuffer * static GstBuffer *
gst_mimenc_create_tcp_header (GstMimEnc * mimenc, guint32 payload_size, gst_mim_enc_create_tcp_header (GstMimEnc * mimenc, guint32 payload_size,
GstClockTime timestamp, gboolean keyframe, gboolean paused) GstClockTime timestamp, gboolean keyframe, gboolean paused)
{ {
// 24 bytes // 24 bytes
@ -388,9 +388,9 @@ gst_mimenc_create_tcp_header (GstMimEnc * mimenc, guint32 payload_size,
} }
static gboolean static gboolean
gst_mimenc_event (GstPad * pad, GstEvent * event) gst_mim_enc_event (GstPad * pad, GstEvent * event)
{ {
GstMimEnc *mimenc = GST_MIMENC (gst_pad_get_parent (pad)); GstMimEnc *mimenc = GST_MIM_ENC (gst_pad_get_parent (pad));
gboolean ret = TRUE; gboolean ret = TRUE;
gboolean forward = TRUE; gboolean forward = TRUE;
@ -459,7 +459,7 @@ newseg_wrong_format:
static void static void
paused_mode_task (gpointer data) paused_mode_task (gpointer data)
{ {
GstMimEnc *mimenc = GST_MIMENC (data); GstMimEnc *mimenc = GST_MIM_ENC (data);
GstClockTime now; GstClockTime now;
GstClockTimeDiff diff; GstClockTimeDiff diff;
GstFlowReturn ret; GstFlowReturn ret;
@ -484,7 +484,7 @@ paused_mode_task (gpointer data)
diff = 0; diff = 0;
if (diff > 3.95 * GST_SECOND) { if (diff > 3.95 * GST_SECOND) {
GstBuffer *buffer = gst_mimenc_create_tcp_header (mimenc, 0, GstBuffer *buffer = gst_mim_enc_create_tcp_header (mimenc, 0,
mimenc->last_buffer + 4 * GST_SECOND, FALSE, TRUE); mimenc->last_buffer + 4 * GST_SECOND, FALSE, TRUE);
GstEvent *event = NULL; GstEvent *event = NULL;
@ -541,9 +541,9 @@ stop_task:
} }
static GstStateChangeReturn static GstStateChangeReturn
gst_mimenc_change_state (GstElement * element, GstStateChange transition) gst_mim_enc_change_state (GstElement * element, GstStateChange transition)
{ {
GstMimEnc *mimenc = GST_MIMENC (element); GstMimEnc *mimenc = GST_MIM_ENC (element);
GstStateChangeReturn ret; GstStateChangeReturn ret;
gboolean paused_mode; gboolean paused_mode;

View file

@ -20,24 +20,24 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GST_MIMENC_H__ #ifndef __GST_MIM_ENC_H__
#define __GST_MIMENC_H__ #define __GST_MIM_ENC_H__
#include <glib.h> #include <glib.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <mimic.h> #include <mimic.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_MIMENC \ #define GST_TYPE_MIM_ENC \
(gst_mimenc_get_type()) (gst_mim_enc_get_type())
#define GST_MIMENC(obj) \ #define GST_MIM_ENC(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MIMENC,GstMimEnc)) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MIM_ENC,GstMimEnc))
#define GST_MIMENC_CLASS(klass) \ #define GST_MIM_ENC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MIMENC,GstMimEnc)) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MIM_ENC,GstMimEnc))
#define GST_IS_MIMENC(obj) \ #define GST_IS_MIM_ENC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MIMENC)) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MIM_ENC))
#define GST_IS_MIMENC_CLASS(obj) \ #define GST_IS_MIM_ENC_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MIMENC)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MIM_ENC))
typedef struct _GstMimEnc GstMimEnc; typedef struct _GstMimEnc GstMimEnc;
typedef struct _GstMimEncClass GstMimEncClass; typedef struct _GstMimEncClass GstMimEncClass;
@ -68,7 +68,7 @@ struct _GstMimEncClass
GstElementClass parent_class; GstElementClass parent_class;
}; };
GType gst_mimenc_get_type (void); GType gst_mim_enc_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_MIMENC_H__ */ #endif /* __GST_MIM_ENC_H__ */

View file

@ -30,9 +30,9 @@
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
if (!gst_element_register (plugin, "mimenc", if (!gst_element_register (plugin, "mimenc", GST_RANK_NONE,
GST_RANK_NONE, GST_TYPE_MIMENC) || GST_TYPE_MIM_ENC) ||
!gst_element_register (plugin, "mimdec", GST_RANK_NONE, GST_TYPE_MIMDEC) !gst_element_register (plugin, "mimdec", GST_RANK_NONE, GST_TYPE_MIM_DEC)
) )
return FALSE; return FALSE;