mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/mad/gstmad.c: Call g_type_class_ref() from a thread-safe context and not from the streaming thread to avoid GLib ...

Browse source 
Original commit message from CVS:
* ext/mad/gstmad.c: (GST_TYPE_MAD_MODE),
(GST_TYPE_MAD_EMPHASIS), (GST_TAG_EMPHASIS), (CHECK_HEADER):
Call g_type_class_ref() from a thread-safe context and not
from the streaming thread to avoid GLib screwing up (see
bug #349410 and #493432). Comment out unused code.
This commit is contained in:
Tim-Philipp Müller 2008-01-10 17:24:09 +00:00
parent 30d994fafa
commit d9e1dfe230
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-01-10 Tim-Philipp Müller <tim at centricular dot net>
* ext/mad/gstmad.c: (GST_TYPE_MAD_MODE),
(GST_TYPE_MAD_EMPHASIS), (GST_TAG_EMPHASIS), (CHECK_HEADER):
Call g_type_class_ref() from a thread-safe context and not
from the streaming thread to avoid GLib screwing up (see
bug #349410 and #493432). Comment out unused code.
2008-01-10 Wim Taymans <wim.taymans@collabora.co.uk> 2008-01-10 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/mpeg2dec/gstmpeg2dec.c: (clear_queued), (flush_queued), * ext/mpeg2dec/gstmpeg2dec.c: (clear_queued), (flush_queued),

17
ext/mad/gstmad.c
View file

@ -106,8 +106,9 @@ _do_init (GType type)
GST_BOILERPLATE_FULL (GstMad, gst_mad, GstElement, GST_TYPE_ELEMENT, _do_init); GST_BOILERPLATE_FULL (GstMad, gst_mad, GstElement, GST_TYPE_ELEMENT, _do_init);
/*
#define GST_TYPE_MAD_LAYER (gst_mad_layer_get_type()) #define GST_TYPE_MAD_LAYER (gst_mad_layer_get_type())
G_GNUC_UNUSED static GType static GType
gst_mad_layer_get_type (void) gst_mad_layer_get_type (void)
{ {
static GType mad_layer_type = 0; static GType mad_layer_type = 0;
@ -124,9 +125,10 @@ gst_mad_layer_get_type (void)
} }
return mad_layer_type; return mad_layer_type;
} }
*/
#define GST_TYPE_MAD_MODE (gst_mad_mode_get_type()) #define GST_TYPE_MAD_MODE (gst_mad_mode_get_type())
G_GNUC_UNUSED static GType static GType
gst_mad_mode_get_type (void) gst_mad_mode_get_type (void)
{ {
static GType mad_mode_type = 0; static GType mad_mode_type = 0;
@ -146,7 +148,7 @@ gst_mad_mode_get_type (void)
} }
#define GST_TYPE_MAD_EMPHASIS (gst_mad_emphasis_get_type()) #define GST_TYPE_MAD_EMPHASIS (gst_mad_emphasis_get_type())
G_GNUC_UNUSED static GType static GType
gst_mad_emphasis_get_type (void) gst_mad_emphasis_get_type (void)
{ {
static GType mad_emphasis_type = 0; static GType mad_emphasis_type = 0;
@ -211,12 +213,17 @@ gst_mad_class_init (GstMadClass * klass)
#define GST_TAG_MODE "mode" #define GST_TAG_MODE "mode"
#define GST_TAG_EMPHASIS "emphasis" #define GST_TAG_EMPHASIS "emphasis"
/* FIXME 0.11: strings!? why? */
gst_tag_register (GST_TAG_LAYER, GST_TAG_FLAG_ENCODED, G_TYPE_UINT, gst_tag_register (GST_TAG_LAYER, GST_TAG_FLAG_ENCODED, G_TYPE_UINT,
"layer", "MPEG audio layer", NULL); "layer", "MPEG audio layer", NULL);
gst_tag_register (GST_TAG_MODE, GST_TAG_FLAG_ENCODED, G_TYPE_STRING, gst_tag_register (GST_TAG_MODE, GST_TAG_FLAG_ENCODED, G_TYPE_STRING,
"mode", "MPEG audio channel mode", NULL); "mode", "MPEG audio channel mode", NULL);
gst_tag_register (GST_TAG_EMPHASIS, GST_TAG_FLAG_ENCODED, G_TYPE_STRING, gst_tag_register (GST_TAG_EMPHASIS, GST_TAG_FLAG_ENCODED, G_TYPE_STRING,
"emphasis", "MPEG audio emphasis", NULL); "emphasis", "MPEG audio emphasis", NULL);
/* ref these here from a thread-safe context (ie. not the streaming thread) */
g_type_class_ref (GST_TYPE_MAD_MODE);
g_type_class_ref (GST_TYPE_MAD_EMPHASIS);
} }
static void static void
@ -896,10 +903,10 @@ G_STMT_START{ \
GEnumValue *emphasis; GEnumValue *emphasis;
mode = mode =
g_enum_get_value (g_type_class_ref (GST_TYPE_MAD_MODE), g_enum_get_value (g_type_class_peek (GST_TYPE_MAD_MODE),
mad->header.mode); mad->header.mode);
emphasis = emphasis =
g_enum_get_value (g_type_class_ref (GST_TYPE_MAD_EMPHASIS), g_enum_get_value (g_type_class_peek (GST_TYPE_MAD_EMPHASIS),
mad->header.emphasis); mad->header.emphasis);
list = gst_tag_list_new (); list = gst_tag_list_new ();
gst_tag_list_add (list, GST_TAG_MERGE_REPLACE, gst_tag_list_add (list, GST_TAG_MERGE_REPLACE,