Menu
▾
▴
[gst-cvs] gst-plugins-bad: dvbsuboverlay: clean-up: dvb sub parser helper doesn' t need to be a GObject
|
From: <tp...@ke...> - 2010-12-25 16:37:16
|
Module: gst-plugins-bad Branch: master Commit: f8dc80a8b7c118fa0159629c43412babb4836bf0 URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=f8dc80a8b7c118fa0159629c43412babb4836bf0 Author: Tim-Philipp Müller <tim...@co...> Date: Fri Dec 24 14:24:12 2010 +0000 dvbsuboverlay: clean-up: dvb sub parser helper doesn't need to be a GObject --- gst/dvbsuboverlay/dvb-sub.c | 105 +++++++++++++++------------------- gst/dvbsuboverlay/dvb-sub.h | 34 +---------- gst/dvbsuboverlay/gstdvbsuboverlay.c | 14 +--- 3 files changed, 54 insertions(+), 99 deletions(-) diff --git a/gst/dvbsuboverlay/dvb-sub.c b/gst/dvbsuboverlay/dvb-sub.c index 803729d..b84ac3c 100644 --- a/gst/dvbsuboverlay/dvb-sub.c +++ b/gst/dvbsuboverlay/dvb-sub.c @@ -30,20 +30,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dvb-sub.h" #include <string.h> /* memset */ #include <gst/gstutils.h> /* GST_READ_UINT16_BE */ #include <gst/base/gstbitreader.h> /* GstBitReader */ #include "ffmpeg-colorspace.h" /* YUV_TO_RGB1_CCIR */ /* FIXME: Just give YUV data to gstreamer then? */ +#include "dvb-sub.h" + GST_DEBUG_CATEGORY_STATIC (dvbsub_debug); #define GST_CAT_DEFAULT dvbsub_debug -void -dvb_sub_init_debug (void) -{ - GST_DEBUG_CATEGORY_INIT (dvbsub_debug, "dvbsub", 0, "dvbsuboverlay parser"); -} +static void dvb_sub_init (void); /* FIXME: Are we waiting for an acquisition point before trying to do things? */ /* FIXME: In the end convert some of the guint8/16 (especially stack variables) back to gint for access efficiency */ @@ -154,10 +151,12 @@ struct _DvbSubPrivate GString *pes_buffer; DVBSubtitleWindow display_def; }; +struct _DvbSub +{ + DvbSubPrivate priv; // FIXME (tpm) -#define DVB_SUB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), DVB_TYPE_SUB, DvbSubPrivate)) - -G_DEFINE_TYPE (DvbSub, dvb_sub, G_TYPE_OBJECT); + DvbSubPrivate *private_data; +}; typedef enum { @@ -280,40 +279,6 @@ delete_state (DvbSub * dvb_sub) g_warning ("Memory deallocation error!"); } -static void -dvb_sub_init (DvbSub * self) -{ - DvbSubPrivate *priv; - - self->private_data = priv = DVB_SUB_GET_PRIVATE (self); - - /* TODO: Add initialization code here */ - /* FIXME: Do we have a reason to initiate the members to zero, or are we guaranteed that anyway? */ - priv->region_list = NULL; - priv->object_list = NULL; - priv->page_time_out = 0; /* FIXME: Maybe 255 instead? */ - priv->pes_buffer = g_string_new (NULL); - - /* display/window information */ - priv->display_def.version = -1; - priv->display_def.window_flag = 0; - priv->display_def.display_width = 720; - priv->display_def.display_height = 576; -} - -static void -dvb_sub_finalize (GObject * object) -{ - DvbSub *self = DVB_SUB (object); - DvbSubPrivate *priv = (DvbSubPrivate *) self->private_data; - /* TODO: Add deinitalization code here */ - /* FIXME: Clear up region_list contents */ - delete_state (self); /* close_pid should have called this, but lets be sure */ - g_string_free (priv->pes_buffer, TRUE); - - G_OBJECT_CLASS (dvb_sub_parent_class)->finalize (object); -} - /* init static data necessary for ffmpeg-colorspace conversion */ static void dsputil_static_init (void) @@ -329,14 +294,11 @@ dsputil_static_init (void) } static void -dvb_sub_class_init (DvbSubClass * klass) +dvb_sub_init (void) { int i, r, g, b, a = 0; - GObjectClass *object_class = (GObjectClass *) klass; - object_class->finalize = dvb_sub_finalize; - - g_type_class_add_private (klass, sizeof (DvbSubPrivate)); + GST_DEBUG_CATEGORY_INIT (dvbsub_debug, "dvbsub", 0, "dvbsuboverlay parser"); dsputil_static_init (); /* Initializes ff_cropTbl table, used in YUV_TO_RGB conversion */ @@ -1377,19 +1339,47 @@ dvb_subtitles_free (DVBSubtitles * sub) g_slice_free (DVBSubtitles, sub); } -/** - * dvb_sub_new: - * - * Creates a new #DvbSub. - * - * Return value: a newly created #DvbSub - */ DvbSub * dvb_sub_new (void) { - DvbSub *dvbsub = g_object_new (DVB_TYPE_SUB, NULL); + static gsize inited = 0; + DvbSubPrivate *sub; + DvbSub *dvb_sub; + + if (g_once_init_enter (&inited)) { + dvb_sub_init (); + g_once_init_leave (&inited, TRUE); + } + + dvb_sub = g_slice_new0 (DvbSub); + dvb_sub->private_data = &dvb_sub->priv; - return dvbsub; + sub = dvb_sub->private_data; + + /* TODO: Add initialization code here */ + /* FIXME: Do we have a reason to initiate the members to zero, or are we guaranteed that anyway? */ + sub->region_list = NULL; + sub->object_list = NULL; + sub->page_time_out = 0; /* FIXME: Maybe 255 instead? */ + sub->pes_buffer = g_string_new (NULL); + + /* display/window information */ + sub->display_def.version = -1; + sub->display_def.window_flag = 0; + sub->display_def.display_width = 720; + sub->display_def.display_height = 576; + + return dvb_sub; +} + +void +dvb_sub_free (DvbSub * sub) +{ + /* TODO: Add deinitalization code here */ + /* FIXME: Clear up region_list contents */ + delete_state (sub); + g_string_free (sub->private_data->pes_buffer, TRUE); + g_slice_free (DvbSub, sub); } #define DVB_SUB_SEGMENT_PAGE_COMPOSITION 0x10 @@ -1528,7 +1518,6 @@ dvb_sub_set_callbacks (DvbSub * dvb_sub, DvbSubCallbacks * callbacks, DvbSubPrivate *priv; g_return_if_fail (dvb_sub != NULL); - g_return_if_fail (DVB_IS_SUB (dvb_sub)); g_return_if_fail (callbacks != NULL); priv = (DvbSubPrivate *) dvb_sub->private_data; diff --git a/gst/dvbsuboverlay/dvb-sub.h b/gst/dvbsuboverlay/dvb-sub.h index ae72977..180047a 100644 --- a/gst/dvbsuboverlay/dvb-sub.h +++ b/gst/dvbsuboverlay/dvb-sub.h @@ -21,39 +21,12 @@ #ifndef _DVB_SUB_H_ #define _DVB_SUB_H_ -#include <glib-object.h> +#include <glib.h> G_BEGIN_DECLS -#define DVB_TYPE_SUB (dvb_sub_get_type ()) -#define DVB_SUB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DVB_TYPE_SUB, DvbSub)) -#define DVB_SUB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DVB_TYPE_SUB, DvbSubClass)) -#define DVB_IS_SUB(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DVB_TYPE_SUB)) -#define DVB_IS_SUB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DVB_TYPE_SUB)) -#define DVB_SUB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DVB_TYPE_SUB, DvbSubClass)) - -typedef struct _DvbSubClass DvbSubClass; typedef struct _DvbSub DvbSub; -struct _DvbSubClass -{ - GObjectClass parent_class; -}; - -/** - * DvbSub: - * - * The #DvbSub struct contains only private fields and should not be - * directly accessed. - */ -struct _DvbSub -{ - GObject parent_instance; - - /*< private >*/ - gpointer private_data; -}; - /** * DVBSubtitlePicture: * @data: the data in the form of palette indices, each byte represents one pixel @@ -153,10 +126,9 @@ typedef struct { gpointer _dvb_sub_reserved[3]; } DvbSubCallbacks; -void dvb_sub_init_debug (void); - -GType dvb_sub_get_type (void) G_GNUC_CONST; DvbSub *dvb_sub_new (void); +void dvb_sub_free (DvbSub * sub); + gint dvb_sub_feed_with_pts (DvbSub *dvb_sub, guint64 pts, guint8 *data, gint len); void dvb_sub_set_callbacks (DvbSub *dvb_sub, DvbSubCallbacks *callbacks, gpointer user_data); void dvb_subtitles_free (DVBSubtitles *sub); diff --git a/gst/dvbsuboverlay/gstdvbsuboverlay.c b/gst/dvbsuboverlay/gstdvbsuboverlay.c index 80ea604..f2b9734 100644 --- a/gst/dvbsuboverlay/gstdvbsuboverlay.c +++ b/gst/dvbsuboverlay/gstdvbsuboverlay.c @@ -168,12 +168,9 @@ gst_dvbsub_overlay_flush_subtitles (GstDVBSubOverlay * render) } if (render->dvb_sub) - g_object_unref (render->dvb_sub); + dvb_sub_free (render->dvb_sub); + render->dvb_sub = dvb_sub_new (); - if (!render->dvb_sub) { - GST_WARNING_OBJECT (render, "cannot create dvbsub instance"); - g_assert_not_reached (); - } { DvbSubCallbacks dvbsub_callbacks = { &new_dvb_subtitles_cb, }; @@ -254,9 +251,8 @@ gst_dvbsub_overlay_finalize (GObject * object) } g_queue_free (overlay->pending_subtitles); - if (overlay->dvb_sub) { - g_object_unref (overlay->dvb_sub); - } + if (overlay->dvb_sub) + dvb_sub_free (overlay->dvb_sub); if (overlay->dvbsub_mutex) g_mutex_free (overlay->dvbsub_mutex); @@ -1157,8 +1153,6 @@ plugin_init (GstPlugin * plugin) GST_DEBUG_CATEGORY_INIT (gst_dvbsub_overlay_debug, "dvbsuboverlay", 0, "DVB subtitle overlay"); - dvb_sub_init_debug (); - return gst_element_register (plugin, "dvbsuboverlay", GST_RANK_PRIMARY, GST_TYPE_DVBSUB_OVERLAY); } |