resindvd: Add support for group-id in the stream-start event
This commit is contained in:
parent
e63094abd5
commit
b5e7ed0428
@ -228,6 +228,9 @@ gst_flups_demux_init (GstFluPSDemux * demux)
|
|||||||
g_malloc0 (sizeof (GstFluPSStream *) * (GST_FLUPS_DEMUX_MAX_STREAMS));
|
g_malloc0 (sizeof (GstFluPSStream *) * (GST_FLUPS_DEMUX_MAX_STREAMS));
|
||||||
|
|
||||||
demux->scr_adjust = GSTTIME_TO_MPEGTIME (SCR_MUNGE);
|
demux->scr_adjust = GSTTIME_TO_MPEGTIME (SCR_MUNGE);
|
||||||
|
|
||||||
|
demux->have_group_id = FALSE;
|
||||||
|
demux->group_id = G_MAXUINT;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@ -262,6 +265,8 @@ gst_flups_demux_reset (GstFluPSDemux * demux)
|
|||||||
|
|
||||||
gst_event_replace (p_ev, NULL);
|
gst_event_replace (p_ev, NULL);
|
||||||
demux->scr_adjust = GSTTIME_TO_MPEGTIME (SCR_MUNGE);
|
demux->scr_adjust = GSTTIME_TO_MPEGTIME (SCR_MUNGE);
|
||||||
|
demux->have_group_id = FALSE;
|
||||||
|
demux->group_id = G_MAXUINT;
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstFluPSStream *
|
static GstFluPSStream *
|
||||||
@ -273,6 +278,7 @@ gst_flups_demux_create_stream (GstFluPSDemux * demux, gint id, gint stream_type)
|
|||||||
GstFluPSDemuxClass *klass = GST_FLUPS_DEMUX_GET_CLASS (demux);
|
GstFluPSDemuxClass *klass = GST_FLUPS_DEMUX_GET_CLASS (demux);
|
||||||
GstCaps *caps;
|
GstCaps *caps;
|
||||||
GstClockTime threshold = SEGMENT_THRESHOLD;
|
GstClockTime threshold = SEGMENT_THRESHOLD;
|
||||||
|
GstEvent *event;
|
||||||
gchar *stream_id;
|
gchar *stream_id;
|
||||||
|
|
||||||
name = NULL;
|
name = NULL;
|
||||||
@ -395,7 +401,23 @@ gst_flups_demux_create_stream (GstFluPSDemux * demux, gint id, gint stream_type)
|
|||||||
stream_id =
|
stream_id =
|
||||||
gst_pad_create_stream_id_printf (stream->pad, GST_ELEMENT_CAST (demux),
|
gst_pad_create_stream_id_printf (stream->pad, GST_ELEMENT_CAST (demux),
|
||||||
"%02x", id);
|
"%02x", id);
|
||||||
gst_pad_push_event (stream->pad, gst_event_new_stream_start (stream_id));
|
|
||||||
|
event = gst_pad_get_sticky_event (demux->sinkpad, GST_EVENT_STREAM_START, 0);
|
||||||
|
if (event) {
|
||||||
|
if (gst_event_parse_group_id (event, &demux->group_id))
|
||||||
|
demux->have_group_id = TRUE;
|
||||||
|
else
|
||||||
|
demux->have_group_id = FALSE;
|
||||||
|
gst_event_unref (event);
|
||||||
|
} else if (!demux->have_group_id) {
|
||||||
|
demux->have_group_id = TRUE;
|
||||||
|
demux->group_id = gst_util_group_id_next ();
|
||||||
|
}
|
||||||
|
event = gst_event_new_stream_start (stream_id);
|
||||||
|
if (demux->have_group_id)
|
||||||
|
gst_event_set_group_id (event, demux->group_id);
|
||||||
|
|
||||||
|
gst_pad_push_event (stream->pad, event);
|
||||||
g_free (stream_id);
|
g_free (stream_id);
|
||||||
|
|
||||||
gst_pad_set_caps (stream->pad, caps);
|
gst_pad_set_caps (stream->pad, caps);
|
||||||
|
@ -99,6 +99,9 @@ struct _GstFluPSDemux {
|
|||||||
gboolean flushing;
|
gboolean flushing;
|
||||||
gboolean in_still;
|
gboolean in_still;
|
||||||
|
|
||||||
|
gboolean have_group_id;
|
||||||
|
guint group_id;
|
||||||
|
|
||||||
GstAdapter * adapter;
|
GstAdapter * adapter;
|
||||||
GstAdapter * rev_adapter;
|
GstAdapter * rev_adapter;
|
||||||
guint64 adapter_offset;
|
guint64 adapter_offset;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user