[vlc-commits] HLS restore pos of current segment before seeking
Frédéric Yhuel
git at videolan.org
Tue Jan 24 19:03:33 CET 2012
vlc | branch: master | Frédéric Yhuel <fyhuel at viotech.net> | Tue Jan 24 14:34:52 2012 +0100| [982071198e54af320b684ac4bd319cc88caceb27] | committer: Jean-Baptiste Kempf
HLS restore pos of current segment before seeking
This prevents a "bug" when we seek backward and then play again that
segment.
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=982071198e54af320b684ac4bd319cc88caceb27
---
modules/stream_filter/httplive.c | 47 +++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 8de9638..82e9c37 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -2196,6 +2196,20 @@ check:
return segment;
}
+static int segment_RestorePos( segment_t *segment )
+{
+ if( segment->data )
+ {
+ uint64_t size = segment->size -segment->data->i_buffer;
+ if( size > 0 )
+ {
+ segment->data->i_buffer += size;
+ segment->data->p_buffer -= size;
+ }
+ }
+ return VLC_SUCCESS;
+}
+
static ssize_t hls_Read(stream_t *s, uint8_t *p_read, unsigned int i_read)
{
stream_sys_t *p_sys = s->p_sys;
@@ -2219,14 +2233,8 @@ static ssize_t hls_Read(stream_t *s, uint8_t *p_read, unsigned int i_read)
segment->data = NULL;
}
else
- { /* reset playback pointer to start of buffer */
- uint64_t size = segment->size - segment->data->i_buffer;
- if (size > 0)
- {
- segment->data->i_buffer += size;
- segment->data->p_buffer -= size;
- }
- }
+ segment_RestorePos( segment );
+
p_sys->playback.segment++;
vlc_mutex_unlock(&segment->lock);
@@ -2421,6 +2429,7 @@ static uint64_t GetStreamSize(stream_t *s)
return size;
}
+
static int segment_Seek(stream_t *s, const uint64_t pos)
{
stream_sys_t *p_sys = s->p_sys;
@@ -2436,6 +2445,17 @@ static int segment_Seek(stream_t *s, const uint64_t pos)
uint64_t size = hls->size;
int count = vlc_array_count(hls->segments);
+ /* restore current segment to start position */
+ segment_t *segment = segment_GetSegment(hls, p_sys->playback.segment);
+ if (segment == NULL)
+ {
+ vlc_mutex_unlock(&hls->lock);
+ return VLC_EGENERIC;
+ }
+ vlc_mutex_lock(&segment->lock);
+ segment_RestorePos( segment );
+ vlc_mutex_unlock(&segment->lock);
+
for (int n = 0; n < count; n++)
{
segment_t *segment = vlc_array_item_at_index(hls->segments, n);
@@ -2480,17 +2500,8 @@ static int segment_Seek(stream_t *s, const uint64_t pos)
vlc_mutex_unlock(&hls->lock);
return VLC_EGENERIC;
}
-
vlc_mutex_lock(&segment->lock);
- if (segment->data)
- {
- uint64_t size = segment->size -segment->data->i_buffer;
- if (size > 0)
- {
- segment->data->i_buffer += size;
- segment->data->p_buffer -= size;
- }
- }
+ segment_RestorePos( segment );
vlc_mutex_unlock(&segment->lock);
/* start download at current playback segment */
More information about the vlc-commits
mailing list