mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlssink(2): Don't write deprecated EXT-X-ALLOW-CACHE metadata

Browse source 
It's deprecated since quite a few versions and various validators
complain about it. Instead of the in-manifest metadata this should be
handled by the normal HTTP caching headers.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2221>
This commit is contained in:
Sebastian Dröge 2021-05-06 10:46:15 +03:00
parent 81ac09cfda
commit da0e6b0afc
4 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/hls/gsthlssink.c
View file

@ -213,8 +213,7 @@ gst_hls_sink_reset (GstHlsSink * sink)
if (sink->playlist) if (sink->playlist)
gst_m3u8_playlist_free (sink->playlist); gst_m3u8_playlist_free (sink->playlist);
sink->playlist = sink->playlist =
gst_m3u8_playlist_new (GST_M3U8_PLAYLIST_VERSION, sink->playlist_length, gst_m3u8_playlist_new (GST_M3U8_PLAYLIST_VERSION, sink->playlist_length);
FALSE);
sink->state = GST_M3U8_PLAYLIST_RENDER_INIT; sink->state = GST_M3U8_PLAYLIST_RENDER_INIT;
} }

3
ext/hls/gsthlssink2.c
View file

@ -374,8 +374,7 @@ gst_hls_sink2_reset (GstHlsSink2 * sink)
if (sink->playlist) if (sink->playlist)
gst_m3u8_playlist_free (sink->playlist); gst_m3u8_playlist_free (sink->playlist);
sink->playlist = sink->playlist =
gst_m3u8_playlist_new (GST_M3U8_PLAYLIST_VERSION, sink->playlist_length, gst_m3u8_playlist_new (GST_M3U8_PLAYLIST_VERSION, sink->playlist_length);
FALSE);
g_queue_foreach (&sink->old_locations, (GFunc) g_free, NULL); g_queue_foreach (&sink->old_locations, (GFunc) g_free, NULL);
g_queue_clear (&sink->old_locations); g_queue_clear (&sink->old_locations);

6
ext/hls/gstm3u8playlist.c
View file

@ -69,14 +69,13 @@ gst_m3u8_entry_free (GstM3U8Entry * entry)
} }
GstM3U8Playlist * GstM3U8Playlist *
gst_m3u8_playlist_new (guint version, guint window_size, gboolean allow_cache) gst_m3u8_playlist_new (guint version, guint window_size)
{ {
GstM3U8Playlist *playlist; GstM3U8Playlist *playlist;
playlist = g_new0 (GstM3U8Playlist, 1); playlist = g_new0 (GstM3U8Playlist, 1);
playlist->version = version; playlist->version = version;
playlist->window_size = window_size; playlist->window_size = window_size;
playlist->allow_cache = allow_cache;
playlist->type = GST_M3U8_PLAYLIST_TYPE_EVENT; playlist->type = GST_M3U8_PLAYLIST_TYPE_EVENT;
playlist->end_list = FALSE; playlist->end_list = FALSE;
playlist->entries = g_queue_new (); playlist->entries = g_queue_new ();
@ -155,9 +154,6 @@ gst_m3u8_playlist_render (GstM3U8Playlist * playlist)
g_string_append_printf (playlist_str, "#EXT-X-VERSION:%d\n", g_string_append_printf (playlist_str, "#EXT-X-VERSION:%d\n",
playlist->version); playlist->version);
g_string_append_printf (playlist_str, "#EXT-X-ALLOW-CACHE:%s\n",
playlist->allow_cache ? "YES" : "NO");
g_string_append_printf (playlist_str, "#EXT-X-MEDIA-SEQUENCE:%d\n", g_string_append_printf (playlist_str, "#EXT-X-MEDIA-SEQUENCE:%d\n",
playlist->sequence_number - playlist->entries->length); playlist->sequence_number - playlist->entries->length);

6
ext/hls/gstm3u8playlist.h
View file

@ -31,7 +31,6 @@ typedef struct _GstM3U8Playlist GstM3U8Playlist;
struct _GstM3U8Playlist struct _GstM3U8Playlist
{ {
guint version; guint version;
gboolean allow_cache;
gint window_size; gint window_size;
gint type; gint type;
gboolean end_list; gboolean end_list;
@ -49,9 +48,8 @@ typedef enum
} GstM3U8PlaylistRenderState; } GstM3U8PlaylistRenderState;
GstM3U8Playlist * gst_m3u8_playlist_new (guint version, GstM3U8Playlist * gst_m3u8_playlist_new (guint version,
guint window_size, guint window_size);
gboolean allow_cache);
void gst_m3u8_playlist_free (GstM3U8Playlist * playlist); void gst_m3u8_playlist_free (GstM3U8Playlist * playlist);