FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

hlsdemux: use a typefinder to set the caps in the source pad

Browse Source
This commit is contained in:
Andoni Morales Alastruey 2011-02-15 21:49:20 +01:00 committed by Sebastian Dröge
parent 3fa4b22149
commit 5a40a62ff4
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gst/hls/gsthlsdemux.c
View File

@ -40,13 +40,13 @@
#include <string.h> #include <string.h>
#include <gst/base/gsttypefindhelper.h>
#include "gsthlsdemux.h" #include "gsthlsdemux.h"
static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/mpegts, systemstream=(boolean)true; " GST_STATIC_CAPS_ANY);
"video/webm"));
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
@ -128,7 +128,7 @@ gst_hls_demux_base_init (gpointer g_class)
gst_element_class_set_details_simple (element_class, gst_element_class_set_details_simple (element_class,
"HLS Source", "HLS Source",
"Decoder", "Demuxer/URIList",
"HTTP Live Streaming source", "HTTP Live Streaming source",
"Marc-Andre Lureau <marcandre.lureau@gmail.com>\n" "Marc-Andre Lureau <marcandre.lureau@gmail.com>\n"
"Andoni Morales Alastruey <ylatuya@gmail.com>"); "Andoni Morales Alastruey <ylatuya@gmail.com>");
@ -584,6 +584,11 @@ gst_hls_demux_reset (GstHLSDemux * demux)
demux->accumulated_delay = 0; demux->accumulated_delay = 0;
demux->end_of_playlist = FALSE; demux->end_of_playlist = FALSE;
if (demux->input_caps) {
gst_caps_unref (demux->input_caps);
demux->input_caps = NULL;
}
if (demux->playlist) { if (demux->playlist) {
gst_buffer_unref (demux->playlist); gst_buffer_unref (demux->playlist);
demux->playlist = NULL; demux->playlist = NULL;
@ -894,6 +899,7 @@ gst_hls_demux_switch_playlist (GstHLSDemux * demux)
static gboolean static gboolean
gst_hls_demux_get_next_fragment (GstHLSDemux * demux, gboolean retry) gst_hls_demux_get_next_fragment (GstHLSDemux * demux, gboolean retry)
{ {
GstBuffer *buf;
const gchar *next_fragment_uri; const gchar *next_fragment_uri;
gboolean discont; gboolean discont;
@ -911,12 +917,23 @@ gst_hls_demux_get_next_fragment (GstHLSDemux * demux, gboolean retry)
if (!gst_hls_demux_fetch_location (demux, next_fragment_uri)) if (!gst_hls_demux_fetch_location (demux, next_fragment_uri))
return FALSE; return FALSE;
if (discont) { buf = demux->downloaded_uri;
GST_DEBUG_OBJECT (demux, "Marking fragment as discontinuous");
GST_BUFFER_FLAG_SET (demux->downloaded_uri, GST_BUFFER_FLAG_DISCONT); if (G_UNLIKELY (demux->input_caps == NULL)) {
demux->input_caps = gst_type_find_helper_for_buffer (NULL, buf, NULL);
if (demux->input_caps) {
gst_pad_set_caps (demux->srcpad, demux->input_caps);
GST_INFO_OBJECT (demux, "Input source caps: %" GST_PTR_FORMAT,
demux->input_caps);
}
} }
g_queue_push_tail (demux->queue, demux->downloaded_uri); if (discont) {
GST_DEBUG_OBJECT (demux, "Marking fragment as discontinuous");
GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT);
}
g_queue_push_tail (demux->queue, buf);
GST_TASK_SIGNAL (demux->task); GST_TASK_SIGNAL (demux->task);
demux->downloaded_uri = NULL; demux->downloaded_uri = NULL;
return TRUE; return TRUE;

1
gst/hls/gsthlsdemux.h
View File

@ -55,6 +55,7 @@ struct _GstHLSDemux
GstPad *srcpad; GstPad *srcpad;
GstPad *sinkpad; GstPad *sinkpad;
GstBuffer *playlist; GstBuffer *playlist;
GstCaps *input_caps;
GstM3U8Client *client; /* M3U8 client */ GstM3U8Client *client; /* M3U8 client */
GQueue *queue; /* Queue storing the fetched fragments */ GQueue *queue; /* Queue storing the fetched fragments */
gboolean need_cache; /* Wheter we need to cache some fragments before starting to push data */ gboolean need_cache; /* Wheter we need to cache some fragments before starting to push data */