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

hlsdemux: Set Cache-Control header according to the caching requirements of the playlist

Browse source
This commit is contained in:
Sebastian Dröge 2014-05-05 09:46:06 +02:00
parent 3c2fe80ab6
commit 0ce2b0632e
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ext/hls/gsthlsdemux.c
View file

@ -810,7 +810,9 @@ _src_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer)
key_fragment = key_fragment =
gst_uri_downloader_fetch_uri (demux->downloader, gst_uri_downloader_fetch_uri (demux->downloader,
demux->current_key, demux->client->main ? demux->current_key, demux->client->main ?
demux->client->main->uri : NULL, FALSE, FALSE, &err); demux->client->main->uri : NULL, FALSE, FALSE,
demux->client->current ? demux->client->current->allowcache : TRUE,
&err);
if (key_fragment == NULL) if (key_fragment == NULL)
goto key_failed; goto key_failed;
demux->key_url = g_strdup (demux->current_key); demux->key_url = g_strdup (demux->current_key);
@ -1491,7 +1493,8 @@ gst_hls_demux_update_playlist (GstHLSDemux * demux, gboolean update,
download = download =
gst_uri_downloader_fetch_uri (demux->downloader, uri, gst_uri_downloader_fetch_uri (demux->downloader, uri,
demux->client->main ? demux->client->main->uri : NULL, TRUE, TRUE, err); demux->client->main ? demux->client->main->uri : NULL, TRUE, TRUE, TRUE,
err);
if (download == NULL) if (download == NULL)
return FALSE; return FALSE;
@ -1797,7 +1800,7 @@ decrypt_error:
static gboolean static gboolean
gst_hls_demux_update_source (GstHLSDemux * demux, const gchar * uri, gst_hls_demux_update_source (GstHLSDemux * demux, const gchar * uri,
const gchar * referer) const gchar * referer, gboolean refresh, gboolean allow_cache)
{ {
if (!gst_uri_is_valid (uri)) if (!gst_uri_is_valid (uri))
return FALSE; return FALSE;
@ -1851,11 +1854,20 @@ gst_hls_demux_update_source (GstHLSDemux * demux, const gchar * uri,
if (g_object_class_find_property (gobject_class, "keep-alive")) if (g_object_class_find_property (gobject_class, "keep-alive"))
g_object_set (demux->src, "keep-alive", TRUE, NULL); g_object_set (demux->src, "keep-alive", TRUE, NULL);
if (g_object_class_find_property (gobject_class, "extra-headers")) { if (g_object_class_find_property (gobject_class, "extra-headers")) {
if (referer) { if (referer || refresh || !allow_cache) {
GstStructure *extra_headers = GstStructure *extra_headers = gst_structure_new_empty ("headers");
gst_structure_new ("headers", "Referer", G_TYPE_STRING, referer,
if (referer)
gst_structure_set (extra_headers, "Referer", G_TYPE_STRING, referer,
NULL); NULL);
if (!allow_cache)
gst_structure_set (extra_headers, "Cache-Control", G_TYPE_STRING,
"no-cache", NULL);
else if (refresh)
gst_structure_set (extra_headers, "Cache-Control", G_TYPE_STRING,
"max-age=0", NULL);
g_object_set (demux->src, "extra-headers", extra_headers, NULL); g_object_set (demux->src, "extra-headers", extra_headers, NULL);
gst_structure_free (extra_headers); gst_structure_free (extra_headers);
@ -1909,8 +1921,11 @@ gst_hls_demux_get_next_fragment (GstHLSDemux * demux,
demux->last_ret = GST_FLOW_OK; demux->last_ret = GST_FLOW_OK;
if (!gst_hls_demux_update_source (demux, next_fragment_uri, if (!gst_hls_demux_update_source (demux, next_fragment_uri,
demux->client->main ? demux->client->main->uri : NULL)) { demux->client->main ? demux->client->main->uri : NULL,
*err = g_error_new (GST_CORE_ERROR, GST_CORE_ERROR_MISSING_PLUGIN, FALSE,
demux->client->current ? demux->client->current->allowcache : TRUE)) {
*err =
g_error_new (GST_CORE_ERROR, GST_CORE_ERROR_MISSING_PLUGIN,
"Missing plugin to handle URI: '%s'", next_fragment_uri); "Missing plugin to handle URI: '%s'", next_fragment_uri);
g_mutex_unlock (&demux->fragment_download_lock); g_mutex_unlock (&demux->fragment_download_lock);
return FALSE; return FALSE;