mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-09 13:21:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Cache the key fragment instead of downloading it over and over again

Browse source
This commit is contained in:
Sebastian Dröge 2014-02-12 10:59:38 +01:00
parent 792d1e0109
commit bc42a18f92
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ext/hls/gsthlsdemux.c
View file

@ -823,6 +823,13 @@ gst_hls_demux_reset (GstHLSDemux * demux, gboolean dispose)
demux->cancelled = FALSE; demux->cancelled = FALSE;
demux->do_typefind = TRUE; demux->do_typefind = TRUE;
g_free (demux->key_url);
demux->key_url = NULL;
if (demux->key_fragment)
g_object_unref (demux->key_fragment);
demux->key_fragment = NULL;
if (demux->input_caps) { if (demux->input_caps) {
gst_caps_unref (demux->input_caps); gst_caps_unref (demux->input_caps);
demux->input_caps = NULL; demux->input_caps = NULL;
@ -1332,10 +1339,23 @@ gst_hls_demux_decrypt_fragment (GstHLSDemux * demux,
GstMapInfo key_info, encrypted_info, decrypted_info; GstMapInfo key_info, encrypted_info, decrypted_info;
gsize unpadded_size; gsize unpadded_size;
if (demux->key_url && strcmp (demux->key_url, key) == 0) {
key_fragment = g_object_ref (demux->key_fragment);
} else {
g_free (demux->key_url);
demux->key_url = NULL;
if (demux->key_fragment)
g_object_unref (demux->key_fragment);
demux->key_fragment = NULL;
GST_INFO_OBJECT (demux, "Fetching key %s", key); GST_INFO_OBJECT (demux, "Fetching key %s", key);
key_fragment = gst_uri_downloader_fetch_uri (demux->downloader, key, err); key_fragment = gst_uri_downloader_fetch_uri (demux->downloader, key, err);
if (key_fragment == NULL) if (key_fragment == NULL)
goto key_failed; goto key_failed;
demux->key_url = g_strdup (key);
demux->key_fragment = g_object_ref (key_fragment);
}
key_buffer = gst_fragment_get_buffer (key_fragment); key_buffer = gst_fragment_get_buffer (key_fragment);
encrypted_buffer = gst_fragment_get_buffer (encrypted_fragment); encrypted_buffer = gst_fragment_get_buffer (encrypted_fragment);

4
ext/hls/gsthlsdemux.h
View file

@ -90,6 +90,10 @@ struct _GstHLSDemux
/* Position in the stream */ /* Position in the stream */
GstClockTime position_shift; GstClockTime position_shift;
gboolean need_segment; gboolean need_segment;
/* Cache for the last key */
gchar *key_url;
GstFragment *key_fragment;
}; };
struct _GstHLSDemuxClass struct _GstHLSDemuxClass