dvdemux: Add support for group-id in the stream-start event
This commit is contained in:
parent
d67a671bfb
commit
c123519fed
@ -273,6 +273,8 @@ gst_dvdemux_reset (GstDVDemux * dvdemux)
|
|||||||
dvdemux->wide = FALSE;
|
dvdemux->wide = FALSE;
|
||||||
gst_segment_init (&dvdemux->byte_segment, GST_FORMAT_BYTES);
|
gst_segment_init (&dvdemux->byte_segment, GST_FORMAT_BYTES);
|
||||||
gst_segment_init (&dvdemux->time_segment, GST_FORMAT_TIME);
|
gst_segment_init (&dvdemux->time_segment, GST_FORMAT_TIME);
|
||||||
|
dvdemux->have_group_id = FALSE;
|
||||||
|
dvdemux->group_id = G_MAXUINT;
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstPad *
|
static GstPad *
|
||||||
@ -1124,6 +1126,26 @@ gst_dvdemux_handle_src_event (GstPad * pad, GstObject * parent,
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
have_group_id (GstDVDemux * demux)
|
||||||
|
{
|
||||||
|
GstEvent *event;
|
||||||
|
|
||||||
|
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 ();
|
||||||
|
}
|
||||||
|
|
||||||
|
return demux->have_group_id;
|
||||||
|
}
|
||||||
|
|
||||||
/* does not take ownership of buffer */
|
/* does not take ownership of buffer */
|
||||||
static GstFlowReturn
|
static GstFlowReturn
|
||||||
gst_dvdemux_demux_audio (GstDVDemux * dvdemux, GstBuffer * buffer,
|
gst_dvdemux_demux_audio (GstDVDemux * dvdemux, GstBuffer * buffer,
|
||||||
@ -1154,13 +1176,16 @@ gst_dvdemux_demux_audio (GstDVDemux * dvdemux, GstBuffer * buffer,
|
|||||||
|| (channels != dvdemux->channels))) {
|
|| (channels != dvdemux->channels))) {
|
||||||
GstCaps *caps;
|
GstCaps *caps;
|
||||||
GstAudioInfo info;
|
GstAudioInfo info;
|
||||||
|
GstEvent *event;
|
||||||
gchar *stream_id;
|
gchar *stream_id;
|
||||||
|
|
||||||
stream_id =
|
stream_id =
|
||||||
gst_pad_create_stream_id (dvdemux->audiosrcpad,
|
gst_pad_create_stream_id (dvdemux->audiosrcpad,
|
||||||
GST_ELEMENT_CAST (dvdemux), "audio");
|
GST_ELEMENT_CAST (dvdemux), "audio");
|
||||||
gst_pad_push_event (dvdemux->audiosrcpad,
|
event = gst_event_new_stream_start (stream_id);
|
||||||
gst_event_new_stream_start (stream_id));
|
if (have_group_id (dvdemux))
|
||||||
|
gst_event_set_group_id (event, dvdemux->group_id);
|
||||||
|
gst_pad_push_event (dvdemux->audiosrcpad, event);
|
||||||
g_free (stream_id);
|
g_free (stream_id);
|
||||||
|
|
||||||
dvdemux->frequency = frequency;
|
dvdemux->frequency = frequency;
|
||||||
@ -1230,13 +1255,16 @@ gst_dvdemux_demux_video (GstDVDemux * dvdemux, GstBuffer * buffer,
|
|||||||
if (G_UNLIKELY ((dvdemux->height != height) || dvdemux->wide != wide)) {
|
if (G_UNLIKELY ((dvdemux->height != height) || dvdemux->wide != wide)) {
|
||||||
GstCaps *caps;
|
GstCaps *caps;
|
||||||
gint par_x, par_y;
|
gint par_x, par_y;
|
||||||
|
GstEvent *event;
|
||||||
gchar *stream_id;
|
gchar *stream_id;
|
||||||
|
|
||||||
stream_id =
|
stream_id =
|
||||||
gst_pad_create_stream_id (dvdemux->videosrcpad,
|
gst_pad_create_stream_id (dvdemux->videosrcpad,
|
||||||
GST_ELEMENT_CAST (dvdemux), "video");
|
GST_ELEMENT_CAST (dvdemux), "video");
|
||||||
gst_pad_push_event (dvdemux->videosrcpad,
|
event = gst_event_new_stream_start (stream_id);
|
||||||
gst_event_new_stream_start (stream_id));
|
if (have_group_id (dvdemux))
|
||||||
|
gst_event_set_group_id (event, dvdemux->group_id);
|
||||||
|
gst_pad_push_event (dvdemux->videosrcpad, event);
|
||||||
g_free (stream_id);
|
g_free (stream_id);
|
||||||
|
|
||||||
dvdemux->height = height;
|
dvdemux->height = height;
|
||||||
|
@ -52,6 +52,9 @@ struct _GstDVDemux {
|
|||||||
GstPad *videosrcpad;
|
GstPad *videosrcpad;
|
||||||
GstPad *audiosrcpad;
|
GstPad *audiosrcpad;
|
||||||
|
|
||||||
|
gboolean have_group_id;
|
||||||
|
guint group_id;
|
||||||
|
|
||||||
dv_decoder_t *decoder;
|
dv_decoder_t *decoder;
|
||||||
|
|
||||||
GstAdapter *adapter;
|
GstAdapter *adapter;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user