mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: small refactor to avoid repeated code

Browse source 
Move segment event update to a function

https://bugzilla.gnome.org/show_bug.cgi?id=773159
This commit is contained in:
Thiago Santos 2017-05-13 15:17:57 -07:00 committed by Edward Hervey
parent 1df725e5cd
commit 33afa6bd18
1 changed files with 38 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -1483,6 +1483,40 @@ gst_adaptive_demux_can_seek (GstAdaptiveDemux * demux)
return klass->seek != NULL;
}
static void
gst_adaptive_demux_update_streams_segment (GstAdaptiveDemux * demux,
GList * streams, gint64 period_start, GstSeekType start_type,
GstSeekType stop_type)
{
GList *iter;
for (iter = streams; iter; iter = g_list_next (iter)) {
GstAdaptiveDemuxStream *stream = iter->data;
GstEvent *seg_evt;
GstClockTime offset;
/* See comments in gst_adaptive_demux_get_period_start_time() for
* an explanation of the segment modifications */
stream->segment = demux->segment;
offset = gst_adaptive_demux_stream_get_presentation_offset (demux, stream);
stream->segment.start += offset - period_start;
if (GST_CLOCK_TIME_IS_VALID (demux->segment.stop))
stream->segment.stop += offset - period_start;
if (demux->segment.rate > 0 && start_type != GST_SEEK_TYPE_NONE)
stream->segment.position = stream->segment.start;
else if (demux->segment.rate < 0 && stop_type != GST_SEEK_TYPE_NONE)
stream->segment.position = stream->segment.stop;
seg_evt = gst_event_new_segment (&stream->segment);
gst_event_set_seqnum (seg_evt, demux->priv->segment_seqnum);
gst_event_replace (&stream->pending_segment, seg_evt);
GST_DEBUG_OBJECT (stream->pad, "Pending segment now %" GST_SEGMENT_FORMAT,
&stream->pending_segment);
gst_event_unref (seg_evt);
/* Make sure the first buffer after a seek has the discont flag */
stream->discont = TRUE;
stream->qos_earliest_time = GST_CLOCK_TIME_NONE;
}
}
#define IS_SNAP_SEEK(f) (f & (GST_SEEK_FLAG_SNAP_BEFORE | \
GST_SEEK_FLAG_SNAP_AFTER | \
GST_SEEK_FLAG_SNAP_NEAREST | \
@ -1741,66 +1775,14 @@ gst_adaptive_demux_handle_seek_event (GstAdaptiveDemux * demux, GstPad * pad,
gst_adaptive_demux_prepare_streams (demux, FALSE);
gst_adaptive_demux_start_tasks (demux, TRUE);
} else {
GList *iter;
GstClockTime period_start =
gst_adaptive_demux_get_period_start_time (demux);
GST_ADAPTIVE_DEMUX_SEGMENT_LOCK (demux);
for (iter = demux->streams; iter; iter = g_list_next (iter)) {
GstAdaptiveDemuxStream *stream = iter->data;
GstEvent *seg_evt;
GstClockTime offset;
/* See comments in gst_adaptive_demux_get_period_start_time() for
* an explanation of the segment modifications */
stream->segment = demux->segment;
offset =
gst_adaptive_demux_stream_get_presentation_offset (demux, stream);
stream->segment.start += offset - period_start;
if (GST_CLOCK_TIME_IS_VALID (demux->segment.stop))
stream->segment.stop += offset - period_start;
if (demux->segment.rate > 0 && start_type != GST_SEEK_TYPE_NONE)
stream->segment.position = stream->segment.start;
else if (demux->segment.rate < 0 && stop_type != GST_SEEK_TYPE_NONE)
stream->segment.position = stream->segment.stop;
seg_evt = gst_event_new_segment (&stream->segment);
gst_event_set_seqnum (seg_evt, demux->priv->segment_seqnum);
gst_event_replace (&stream->pending_segment, seg_evt);
GST_DEBUG_OBJECT (stream->pad, "Pending segment now %" GST_SEGMENT_FORMAT,
&stream->pending_segment);
gst_event_unref (seg_evt);
/* Make sure the first buffer after a seek has the discont flag */
stream->discont = TRUE;
}
/* Same thing but for prepared streams that haven't been exposed yet */
for (iter = demux->prepared_streams; iter; iter = g_list_next (iter)) {
GstAdaptiveDemuxStream *stream = iter->data;
GstEvent *seg_evt;
GstClockTime offset;
/* See comments in gst_adaptive_demux_get_period_start_time() for
* an explanation of the segment modifications */
stream->segment = demux->segment;
offset =
gst_adaptive_demux_stream_get_presentation_offset (demux, stream);
stream->segment.start += offset - period_start;
if (GST_CLOCK_TIME_IS_VALID (demux->segment.stop))
stream->segment.stop += offset - period_start;
if (demux->segment.rate > 0 && start_type != GST_SEEK_TYPE_NONE)
stream->segment.position = stream->segment.start;
else if (demux->segment.rate < 0 && stop_type != GST_SEEK_TYPE_NONE)
stream->segment.position = stream->segment.stop;
seg_evt = gst_event_new_segment (&stream->segment);
gst_event_set_seqnum (seg_evt, demux->priv->segment_seqnum);
gst_event_replace (&stream->pending_segment, seg_evt);
GST_DEBUG_OBJECT (stream->pad, "Pending segment now %" GST_SEGMENT_FORMAT,
&stream->pending_segment);
gst_event_unref (seg_evt);
/* Make sure the first buffer after a seek has the discont flag */
stream->discont = TRUE;
stream->qos_earliest_time = GST_CLOCK_TIME_NONE;
}
gst_adaptive_demux_update_streams_segment (demux, demux->streams,
period_start, start_type, stop_type);
gst_adaptive_demux_update_streams_segment (demux, demux->prepared_streams,
period_start, start_type, stop_type);
GST_ADAPTIVE_DEMUX_SEGMENT_UNLOCK (demux);
/* Restart the demux */