Commit f16916f7 authored by Thiago Santos's avatar Thiago Santos
Browse files

adaptivedemux: add utility function to get stream from pad

Simplifies the code a bit and avoid repeating this
common operation
parent 63af4649
...@@ -1077,6 +1077,21 @@ gst_adaptive_demux_stream_new (GstAdaptiveDemux * demux, GstPad * pad) ...@@ -1077,6 +1077,21 @@ gst_adaptive_demux_stream_new (GstAdaptiveDemux * demux, GstPad * pad)
return stream; return stream;
} }
GstAdaptiveDemuxStream *
gst_adaptive_demux_find_stream_for_pad (GstAdaptiveDemux * demux, GstPad * pad)
{
GList *iter;
for (iter = demux->streams; iter; iter = g_list_next (iter)) {
GstAdaptiveDemuxStream *stream = iter->data;
if (stream->pad == pad) {
return stream;
}
}
g_assert_not_reached ();
return NULL;
}
/* must be called with manifest_lock taken. /* must be called with manifest_lock taken.
* It will temporarily drop the manifest_lock in order to join the task. * It will temporarily drop the manifest_lock in order to join the task.
* It will join only the old_streams (the demux->streams are joined by * It will join only the old_streams (the demux->streams are joined by
...@@ -1354,26 +1369,23 @@ gst_adaptive_demux_src_event (GstPad * pad, GstObject * parent, ...@@ -1354,26 +1369,23 @@ gst_adaptive_demux_src_event (GstPad * pad, GstObject * parent,
return ret; return ret;
} }
case GST_EVENT_RECONFIGURE:{ case GST_EVENT_RECONFIGURE:{
GList *iter; GstAdaptiveDemuxStream *stream;
GST_MANIFEST_LOCK (demux); GST_MANIFEST_LOCK (demux);
stream = gst_adaptive_demux_find_stream_for_pad (demux, pad);
for (iter = demux->streams; iter; iter = g_list_next (iter)) {
GstAdaptiveDemuxStream *stream = iter->data; if (stream) {
if (stream->last_ret == GST_FLOW_NOT_LINKED) {
if (stream->pad == pad) { stream->last_ret = GST_FLOW_OK;
if (stream->last_ret == GST_FLOW_NOT_LINKED) { stream->restart_download = TRUE;
stream->last_ret = GST_FLOW_OK; stream->need_header = TRUE;
stream->restart_download = TRUE; stream->discont = TRUE;
stream->need_header = TRUE; GST_DEBUG_OBJECT (stream->pad, "Restarting download loop");
stream->discont = TRUE; gst_task_start (stream->download_task);
GST_DEBUG_OBJECT (stream->pad, "Restarting download loop");
gst_task_start (stream->download_task);
}
gst_event_unref (event);
GST_MANIFEST_UNLOCK (demux);
return TRUE;
} }
gst_event_unref (event);
GST_MANIFEST_UNLOCK (demux);
return TRUE;
} }
GST_MANIFEST_UNLOCK (demux); GST_MANIFEST_UNLOCK (demux);
} }
......
...@@ -430,6 +430,8 @@ void gst_adaptive_demux_set_stream_struct_size (GstAdaptiveDemux * demux, ...@@ -430,6 +430,8 @@ void gst_adaptive_demux_set_stream_struct_size (GstAdaptiveDemux * demux,
GstAdaptiveDemuxStream *gst_adaptive_demux_stream_new (GstAdaptiveDemux * demux, GstAdaptiveDemuxStream *gst_adaptive_demux_stream_new (GstAdaptiveDemux * demux,
GstPad * pad); GstPad * pad);
GstAdaptiveDemuxStream *gst_adaptive_demux_find_stream_for_pad (GstAdaptiveDemux * demux,
GstPad * pad);
void gst_adaptive_demux_stream_set_caps (GstAdaptiveDemuxStream * stream, void gst_adaptive_demux_stream_set_caps (GstAdaptiveDemuxStream * stream,
GstCaps * caps); GstCaps * caps);
void gst_adaptive_demux_stream_set_tags (GstAdaptiveDemuxStream * stream, void gst_adaptive_demux_stream_set_tags (GstAdaptiveDemuxStream * stream,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment