[vlc-commits] stream_filter/httplive.c: fix EXT-X-MEDIA-SEQUENCE error message for HLS live streams.

[Jean-Paul Saman]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Wed Dec 21 11:16:27 2011 +0100| [520804cef593abf761e0b5de995dc788f507cf84] | committer: Jean-Paul Saman

stream_filter/httplive.c: fix EXT-X-MEDIA-SEQUENCE error message for HLS live streams.

The error message  "EXT-X-MEDIA-SEQUENCE already present in playlist (new=%d, old=%d)" was
triggered way to often for HLS live streams. In addition the new metadata from a new HLS
playlist was not updated in the internal list.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=520804cef593abf761e0b5de995dc788f507cf84
---

 modules/stream_filter/httplive.c |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 299c23b..4d60d8a 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -76,7 +76,7 @@ typedef struct hls_stream_s
     int         id;         /* program id */
     int         version;    /* protocol version should be 1 */
     int         sequence;   /* media sequence number */
-    int         duration;   /* maximum duration per segment (ms) */
+    int         duration;   /* maximum duration per segment (s) */
     uint64_t    bandwidth;  /* bandwidth usage of segments (bits per second)*/
     uint64_t    size;       /* stream length (segment->duration * hls->bandwidth/8) */
 
@@ -680,9 +680,18 @@ static int parse_MediaSequence(stream_t *s, hls_stream_t *hls, char *p_read)
     }
 
     if (hls->sequence > 0)
-        msg_Err(s, "EXT-X-MEDIA-SEQUENCE already present in playlist (new=%d, old=%d)",
-                    sequence, hls->sequence);
-
+    {
+        if (s->p_sys->b_live)
+        {
+            hls_stream_t *last = hls_GetLast(s->p_sys->hls_stream);
+            if ((last->sequence < sequence) && (sequence - last->sequence != 1))
+                msg_Err(s, "EXT-X-MEDIA-SEQUENCE gap in playlist (new=%d, old=%d)",
+                            sequence, last->sequence);
+        }
+        else
+            msg_Err(s, "EXT-X-MEDIA-SEQUENCE already present in playlist (new=%d, old=%d)",
+                        sequence, hls->sequence);
+    }
     hls->sequence = sequence;
     return VLC_SUCCESS;
 }
@@ -1098,6 +1107,13 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
         }
         vlc_mutex_unlock(&(*hls)->lock);
     }
+
+    /* update meta information */
+    vlc_mutex_lock(&(*hls)->lock);
+    (*hls)->sequence = hls_new->sequence;
+    (*hls)->duration = (hls_new->duration == -1) ? (*hls)->duration : hls_new->duration;
+    (*hls)->b_cache = hls_new->b_cache;
+    vlc_mutex_unlock(&(*hls)->lock);
     return VLC_SUCCESS;
 
 fail_and_unlock: