mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 05:16:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Use the downloader of the base class instead of creating our own

Browse source 
The one of the base class is completely unused because we override all
the downloading here, so let's just use that one instead.
This commit is contained in:
Sebastian Dröge 2015-04-23 17:39:46 +02:00
parent 5fd2fc3050
commit 7c2a5da125
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ext/hls/gsthlsdemux.c
View file

@ -129,11 +129,6 @@ gst_hls_demux_dispose (GObject * obj)
{ {
GstHLSDemux *demux = GST_HLS_DEMUX (obj); GstHLSDemux *demux = GST_HLS_DEMUX (obj);
if (demux->downloader != NULL) {
g_object_unref (demux->downloader);
demux->downloader = NULL;
}
gst_hls_demux_reset (GST_ADAPTIVE_DEMUX_CAST (demux)); gst_hls_demux_reset (GST_ADAPTIVE_DEMUX_CAST (demux));
gst_m3u8_client_free (demux->client); gst_m3u8_client_free (demux->client);
@ -206,11 +201,7 @@ gst_hls_demux_class_init (GstHLSDemuxClass * klass)
static void static void
gst_hls_demux_init (GstHLSDemux * demux) gst_hls_demux_init (GstHLSDemux * demux)
{ {
/* Downloader */
demux->downloader = gst_uri_downloader_new ();
demux->do_typefind = TRUE; demux->do_typefind = TRUE;
} }
static void static void
@ -249,7 +240,6 @@ gst_hls_demux_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
gst_hls_demux_reset (GST_ADAPTIVE_DEMUX_CAST (demux)); gst_hls_demux_reset (GST_ADAPTIVE_DEMUX_CAST (demux));
gst_uri_downloader_reset (demux->downloader);
break; break;
default: default:
break; break;
@ -334,7 +324,7 @@ gst_hls_demux_seek (GstAdaptiveDemux * demux, GstEvent * seek)
GST_M3U8_CLIENT_UNLOCK (hlsdemux->client); GST_M3U8_CLIENT_UNLOCK (hlsdemux->client);
gst_m3u8_client_set_current (hlsdemux->client, gst_m3u8_client_set_current (hlsdemux->client,
hlsdemux->client->main->iframe_lists->data); hlsdemux->client->main->iframe_lists->data);
gst_uri_downloader_reset (hlsdemux->downloader); gst_uri_downloader_reset (demux->downloader);
if (!gst_hls_demux_update_playlist (hlsdemux, FALSE, &err)) { if (!gst_hls_demux_update_playlist (hlsdemux, FALSE, &err)) {
GST_ELEMENT_ERROR_FROM_ERROR (hlsdemux, "Could not switch playlist", err); GST_ELEMENT_ERROR_FROM_ERROR (hlsdemux, "Could not switch playlist", err);
return FALSE; return FALSE;
@ -353,7 +343,7 @@ gst_hls_demux_seek (GstAdaptiveDemux * demux, GstEvent * seek)
GST_M3U8_CLIENT_UNLOCK (hlsdemux->client); GST_M3U8_CLIENT_UNLOCK (hlsdemux->client);
gst_m3u8_client_set_current (hlsdemux->client, gst_m3u8_client_set_current (hlsdemux->client,
hlsdemux->client->main->lists->data); hlsdemux->client->main->lists->data);
gst_uri_downloader_reset (hlsdemux->downloader); gst_uri_downloader_reset (demux->downloader);
if (!gst_hls_demux_update_playlist (hlsdemux, FALSE, &err)) { if (!gst_hls_demux_update_playlist (hlsdemux, FALSE, &err)) {
GST_ELEMENT_ERROR_FROM_ERROR (hlsdemux, "Could not switch playlist", err); GST_ELEMENT_ERROR_FROM_ERROR (hlsdemux, "Could not switch playlist", err);
return FALSE; return FALSE;
@ -514,7 +504,7 @@ gst_hls_demux_start_fragment (GstAdaptiveDemux * demux,
GST_INFO_OBJECT (demux, "Fetching key %s", hlsdemux->current_key); GST_INFO_OBJECT (demux, "Fetching key %s", hlsdemux->current_key);
key_fragment = key_fragment =
gst_uri_downloader_fetch_uri (hlsdemux->downloader, gst_uri_downloader_fetch_uri (demux->downloader,
hlsdemux->current_key, hlsdemux->client->main ? hlsdemux->current_key, hlsdemux->client->main ?
hlsdemux->client->main->uri : NULL, FALSE, FALSE, hlsdemux->client->main->uri : NULL, FALSE, FALSE,
hlsdemux->client->current ? hlsdemux->client->current-> hlsdemux->client->current ? hlsdemux->client->current->
@ -867,6 +857,7 @@ static gboolean
gst_hls_demux_update_playlist (GstHLSDemux * demux, gboolean update, gst_hls_demux_update_playlist (GstHLSDemux * demux, gboolean update,
GError ** err) GError ** err)
{ {
GstAdaptiveDemux *adaptive_demux = GST_ADAPTIVE_DEMUX (demux);
GstFragment *download; GstFragment *download;
GstBuffer *buf; GstBuffer *buf;
gchar *playlist; gchar *playlist;
@ -877,7 +868,7 @@ retry:
uri = gst_m3u8_client_get_current_uri (demux->client); uri = gst_m3u8_client_get_current_uri (demux->client);
main_uri = gst_m3u8_client_get_uri (demux->client); main_uri = gst_m3u8_client_get_uri (demux->client);
download = download =
gst_uri_downloader_fetch_uri (demux->downloader, uri, main_uri, gst_uri_downloader_fetch_uri (adaptive_demux->downloader, uri, main_uri,
TRUE, TRUE, TRUE, err); TRUE, TRUE, TRUE, err);
g_free (main_uri); g_free (main_uri);
if (download == NULL) { if (download == NULL) {
@ -890,7 +881,7 @@ retry:
"Updating playlist %s failed, attempt to refresh variant playlist %s", "Updating playlist %s failed, attempt to refresh variant playlist %s",
uri, main_uri); uri, main_uri);
download = download =
gst_uri_downloader_fetch_uri (demux->downloader, gst_uri_downloader_fetch_uri (adaptive_demux->downloader,
main_uri, NULL, TRUE, TRUE, TRUE, &err2); main_uri, NULL, TRUE, TRUE, TRUE, &err2);
g_free (main_uri); g_free (main_uri);
g_clear_error (&err2); g_clear_error (&err2);

2
ext/hls/gsthlsdemux.h
View file

@ -27,7 +27,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include "m3u8.h" #include "m3u8.h"
#include "gstfragmented.h" #include "gstfragmented.h"
#include <gst/uridownloader/gsturidownloader.h>
#include <gst/adaptivedemux/gstadaptivedemux.h> #include <gst/adaptivedemux/gstadaptivedemux.h>
#if defined(HAVE_OPENSSL) #if defined(HAVE_OPENSSL)
#include <openssl/evp.h> #include <openssl/evp.h>
@ -68,7 +67,6 @@ struct _GstHLSDemux
gint srcpad_counter; gint srcpad_counter;
GstCaps *input_caps; GstCaps *input_caps;
GstUriDownloader *downloader;
gchar *uri; /* Original playlist URI */ gchar *uri; /* Original playlist URI */
GstM3U8Client *client; /* M3U8 client */ GstM3U8Client *client; /* M3U8 client */
gboolean do_typefind; /* Whether we need to typefind the next buffer */ gboolean do_typefind; /* Whether we need to typefind the next buffer */