mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: No need to store position since it's the buffer's timestamp

Browse source 
This also will fix the issue of having the current position different
from the actual position of the first buffer in the queue in case
the caching caused a resync of the sequence number.

Conflicts:

	gst/hls/gsthlsdemux.c
This commit is contained in:
Youness Alaoui 2012-05-08 11:09:28 -04:00 committed by Thibault Saunier
parent 87d10cf683
commit 3cc3e9ad1b
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst/hls/gsthlsdemux.c
View file

@ -330,7 +330,7 @@ gst_hls_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
GstSeekType start_type, stop_type; GstSeekType start_type, stop_type;
gint64 start, stop; gint64 start, stop;
GList *walk; GList *walk;
GstClockTime current_pos, target_pos; GstClockTime position, current_pos, target_pos;
gint current_sequence; gint current_sequence;
GstM3U8MediaFile *file; GstM3U8MediaFile *file;
@ -397,8 +397,8 @@ gst_hls_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
GST_M3U8_CLIENT_LOCK (demux->client); GST_M3U8_CLIENT_LOCK (demux->client);
GST_DEBUG_OBJECT (demux, "seeking to sequence %d", current_sequence); GST_DEBUG_OBJECT (demux, "seeking to sequence %d", current_sequence);
demux->client->sequence = current_sequence; demux->client->sequence = current_sequence;
gst_m3u8_client_get_current_position (demux->client, &demux->position); gst_m3u8_client_get_current_position (demux->client, &position);
demux->position_shift = start - demux->position; demux->position_shift = start - position;
demux->need_segment = TRUE; demux->need_segment = TRUE;
GST_M3U8_CLIENT_UNLOCK (demux->client); GST_M3U8_CLIENT_UNLOCK (demux->client);
@ -663,8 +663,10 @@ gst_hls_demux_stream_loop (GstHLSDemux * demux)
g_object_unref (fragment); g_object_unref (fragment);
if (demux->need_segment) { if (demux->need_segment) {
GstClockTime start = demux->position + demux->position_shift;
GstSegment segment; GstSegment segment;
GstClockTime start = GST_BUFFER_PTS (buf);
start += demux->position_shift;
/* And send a newsegment */ /* And send a newsegment */
GST_DEBUG_OBJECT (demux, "Sending new-segment. segment start:%" GST_DEBUG_OBJECT (demux, "Sending new-segment. segment start:%"
GST_TIME_FORMAT, GST_TIME_ARGS (start)); GST_TIME_FORMAT, GST_TIME_ARGS (start));
@ -676,9 +678,6 @@ gst_hls_demux_stream_loop (GstHLSDemux * demux)
demux->position_shift = 0; demux->position_shift = 0;
} }
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DURATION (buf)))
demux->position += GST_BUFFER_DURATION (buf);
ret = gst_pad_push (demux->srcpad, buf); ret = gst_pad_push (demux->srcpad, buf);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto error_pushing; goto error_pushing;
@ -754,7 +753,6 @@ gst_hls_demux_reset (GstHLSDemux * demux, gboolean dispose)
} }
g_queue_clear (demux->queue); g_queue_clear (demux->queue);
demux->position = 0;
demux->position_shift = 0; demux->position_shift = 0;
demux->need_segment = TRUE; demux->need_segment = TRUE;
} }
@ -877,7 +875,6 @@ gst_hls_demux_cache_fragments (GstHLSDemux * demux)
demux->client->sequence -= demux->fragments_cache; demux->client->sequence -= demux->fragments_cache;
else else
demux->client->sequence = 0; demux->client->sequence = 0;
gst_m3u8_client_get_current_position (demux->client, &demux->position);
GST_M3U8_CLIENT_UNLOCK (demux->client); GST_M3U8_CLIENT_UNLOCK (demux->client);
} else { } else {
GstClockTime duration = gst_m3u8_client_get_duration (demux->client); GstClockTime duration = gst_m3u8_client_get_duration (demux->client);

1
gst/hls/gsthlsdemux.h
View file

@ -85,7 +85,6 @@ struct _GstHLSDemux
gboolean cancelled; gboolean cancelled;
/* Position in the stream */ /* Position in the stream */
GstClockTime position;
GstClockTime position_shift; GstClockTime position_shift;
gboolean need_segment; gboolean need_segment;
}; };