mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 12:32:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

siddec: Add support for group-id in the stream-start event

Browse source
This commit is contained in:
Sebastian Dröge 2013-07-22 15:43:18 +02:00
parent 3c6a9d3e37
commit 828791fadc
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ext/sidplay/gstsiddec.cc
View file

@ -205,7 +205,8 @@ gst_siddec_class_init (GstSidDecClass * klass)
gst_element_class_add_pad_template (gstelement_class, gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&sink_templ)); gst_static_pad_template_get (&sink_templ));
GST_DEBUG_CATEGORY_INIT (gst_siddec_debug, "siddec", 0, "C64 sid song player"); GST_DEBUG_CATEGORY_INIT (gst_siddec_debug, "siddec", 0,
"C64 sid song player");
} }
static void static void
@ -241,6 +242,9 @@ gst_siddec_init (GstSidDec * siddec)
siddec->tune_number = 0; siddec->tune_number = 0;
siddec->total_bytes = 0; siddec->total_bytes = 0;
siddec->blocksize = DEFAULT_BLOCKSIZE; siddec->blocksize = DEFAULT_BLOCKSIZE;
siddec->have_group_id = FALSE;
siddec->group_id = G_MAXUINT;
} }
static void static void
@ -292,6 +296,7 @@ siddec_negotiate (GstSidDec * siddec)
GstCaps *caps; GstCaps *caps;
const gchar *str; const gchar *str;
GstAudioFormat format; GstAudioFormat format;
GstEvent *event;
gchar *stream_id; gchar *stream_id;
allowed = gst_pad_get_allowed_caps (siddec->srcpad); allowed = gst_pad_get_allowed_caps (siddec->srcpad);
@ -335,8 +340,27 @@ siddec_negotiate (GstSidDec * siddec)
gst_structure_get_int (structure, "channels", &channels); gst_structure_get_int (structure, "channels", &channels);
siddec->config->channels = channels; siddec->config->channels = channels;
stream_id = gst_pad_create_stream_id (siddec->srcpad, GST_ELEMENT_CAST (siddec), NULL); stream_id =
gst_pad_push_event (siddec->srcpad, gst_event_new_stream_start (stream_id)); gst_pad_create_stream_id (siddec->srcpad, GST_ELEMENT_CAST (siddec),
NULL);
event = gst_pad_get_sticky_event (siddec->sinkpad, GST_EVENT_STREAM_START, 0);
if (event) {
if (gst_event_parse_group_id (event, &siddec->group_id))
siddec->have_group_id = TRUE;
else
siddec->have_group_id = FALSE;
gst_event_unref (event);
} else if (!siddec->have_group_id) {
siddec->have_group_id = TRUE;
siddec->group_id = gst_util_group_id_next ();
}
event = gst_event_new_stream_start (stream_id);
if (siddec->have_group_id)
gst_event_set_group_id (event, siddec->group_id);
gst_pad_push_event (siddec->srcpad, event);
g_free (stream_id); g_free (stream_id);
caps = gst_caps_new_simple ("audio/x-raw", caps = gst_caps_new_simple ("audio/x-raw",
@ -462,6 +486,8 @@ start_play_tune (GstSidDec * siddec)
gst_segment_init (&segment, GST_FORMAT_TIME); gst_segment_init (&segment, GST_FORMAT_TIME);
gst_pad_push_event (siddec->srcpad, gst_event_new_segment (&segment)); gst_pad_push_event (siddec->srcpad, gst_event_new_segment (&segment));
siddec->total_bytes = 0; siddec->total_bytes = 0;
siddec->have_group_id = FALSE;
siddec->group_id = G_MAXUINT;
res = gst_pad_start_task (siddec->srcpad, res = gst_pad_start_task (siddec->srcpad,
(GstTaskFunction) play_loop, siddec->srcpad, NULL); (GstTaskFunction) play_loop, siddec->srcpad, NULL);

3
ext/sidplay/gstsiddec.h
View file

@ -49,6 +49,9 @@ struct _GstSidDec {
GstPad *sinkpad, GstPad *sinkpad,
*srcpad; *srcpad;
gboolean have_group_id;
guint group_id;
guchar *tune_buffer; guchar *tune_buffer;
gint tune_len; gint tune_len;
gint tune_number; gint tune_number;