mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: remove helper function only used once

Browse source
This commit is contained in:
Tim-Philipp Müller 2015-08-30 21:35:02 +01:00
parent 917b034238
commit b8a155c17d
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/hls/gsthlsdemux.c
View file

@ -67,8 +67,6 @@ gst_hls_demux_change_state (GstElement * element, GstStateChange transition);
/* GstHLSDemux */ /* GstHLSDemux */
static gboolean gst_hls_demux_update_playlist (GstHLSDemux * demux, static gboolean gst_hls_demux_update_playlist (GstHLSDemux * demux,
gboolean update, GError ** err); gboolean update, GError ** err);
static gboolean gst_hls_demux_set_location (GstHLSDemux * demux,
const gchar * uri, const gchar * base_uri);
static gchar *gst_hls_src_buf_to_utf8_playlist (GstBuffer * buf); static gchar *gst_hls_src_buf_to_utf8_playlist (GstBuffer * buf);
static gboolean gst_hls_demux_change_playlist (GstHLSDemux * demux, static gboolean gst_hls_demux_change_playlist (GstHLSDemux * demux,
@ -364,8 +362,14 @@ gst_hls_demux_process_manifest (GstAdaptiveDemux * demux, GstBuffer * buf)
GstHLSDemux *hlsdemux = GST_HLS_DEMUX_CAST (demux); GstHLSDemux *hlsdemux = GST_HLS_DEMUX_CAST (demux);
gchar *playlist = NULL; gchar *playlist = NULL;
gst_hls_demux_set_location (hlsdemux, demux->manifest_uri, if (hlsdemux->client)
demux->manifest_base_uri); gst_m3u8_client_free (hlsdemux->client);
hlsdemux->client =
gst_m3u8_client_new (demux->manifest_uri, demux->manifest_base_uri);
GST_INFO_OBJECT (demux, "Changed location: %s (base uri: %s)",
demux->manifest_uri, GST_STR_NULL (demux->manifest_base_uri));
playlist = gst_hls_src_buf_to_utf8_playlist (buf); playlist = gst_hls_src_buf_to_utf8_playlist (buf);
if (playlist == NULL) { if (playlist == NULL) {
@ -750,18 +754,6 @@ gst_hls_demux_reset (GstAdaptiveDemux * ademux)
gst_hls_demux_decrypt_end (demux); gst_hls_demux_decrypt_end (demux);
} }
static gboolean
gst_hls_demux_set_location (GstHLSDemux * demux, const gchar * uri,
const gchar * base_uri)
{
if (demux->client)
gst_m3u8_client_free (demux->client);
demux->client = gst_m3u8_client_new (uri, base_uri);
GST_INFO_OBJECT (demux, "Changed location: %s (base uri: %s)", uri,
GST_STR_NULL (base_uri));
return TRUE;
}
static gchar * static gchar *
gst_hls_src_buf_to_utf8_playlist (GstBuffer * buf) gst_hls_src_buf_to_utf8_playlist (GstBuffer * buf)
{ {