mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 13:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

adaptivedemux: prefix the statistics message name macro

Browse source 
Keep old define around for now.

https://bugzilla.gnome.org/show_bug.cgi?id=754686
This commit is contained in:
Philippe Normand 2015-09-07 16:57:05 +02:00 committed by Tim-Philipp Müller
parent e990e75e1e
commit 261d8daca0
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/hls/gsthlsdemux.c
View file

@ -1059,7 +1059,7 @@ retry_failover_protection:
main_uri = gst_m3u8_client_get_uri (demux->client); main_uri = gst_m3u8_client_get_uri (demux->client);
gst_element_post_message (GST_ELEMENT_CAST (demux), gst_element_post_message (GST_ELEMENT_CAST (demux),
gst_message_new_element (GST_OBJECT_CAST (demux), gst_message_new_element (GST_OBJECT_CAST (demux),
gst_structure_new (STATISTICS_MESSAGE_NAME, gst_structure_new (GST_ADAPTIVE_DEMUX_STATISTICS_MESSAGE_NAME,
"manifest-uri", G_TYPE_STRING, "manifest-uri", G_TYPE_STRING,
main_uri, "uri", G_TYPE_STRING, main_uri, "uri", G_TYPE_STRING,
uri, "bitrate", G_TYPE_INT, new_bandwidth, NULL))); uri, "bitrate", G_TYPE_INT, new_bandwidth, NULL)));

4
gst-libs/gst/adaptivedemux/gstadaptivedemux.c
View file

@ -484,7 +484,7 @@ gst_adaptive_demux_sink_event (GstPad * pad, GstObject * parent,
gst_element_post_message (GST_ELEMENT_CAST (demux), gst_element_post_message (GST_ELEMENT_CAST (demux),
gst_message_new_element (GST_OBJECT_CAST (demux), gst_message_new_element (GST_OBJECT_CAST (demux),
gst_structure_new (STATISTICS_MESSAGE_NAME, gst_structure_new (GST_ADAPTIVE_DEMUX_STATISTICS_MESSAGE_NAME,
"manifest-uri", G_TYPE_STRING, "manifest-uri", G_TYPE_STRING,
demux->manifest_uri, "uri", G_TYPE_STRING, demux->manifest_uri, "uri", G_TYPE_STRING,
demux->manifest_uri, demux->manifest_uri,
@ -2558,7 +2558,7 @@ gst_adaptive_demux_stream_advance_fragment_unlocked (GstAdaptiveDemux * demux,
/* FIXME - url has no indication of byte ranges for subsegments */ /* FIXME - url has no indication of byte ranges for subsegments */
gst_element_post_message (GST_ELEMENT_CAST (demux), gst_element_post_message (GST_ELEMENT_CAST (demux),
gst_message_new_element (GST_OBJECT_CAST (demux), gst_message_new_element (GST_OBJECT_CAST (demux),
gst_structure_new (STATISTICS_MESSAGE_NAME, gst_structure_new (GST_ADAPTIVE_DEMUX_STATISTICS_MESSAGE_NAME,
"manifest-uri", G_TYPE_STRING, "manifest-uri", G_TYPE_STRING,
demux->manifest_uri, "uri", G_TYPE_STRING, demux->manifest_uri, "uri", G_TYPE_STRING,
stream->fragment.uri, "fragment-start-time", stream->fragment.uri, "fragment-start-time",

14
gst-libs/gst/adaptivedemux/gstadaptivedemux.h
View file

@ -63,7 +63,19 @@ G_BEGIN_DECLS
#define GST_ADAPTIVE_DEMUX_STREAM_NEED_HEADER(obj) (((GstAdaptiveDemuxStream *) (obj))->need_header) #define GST_ADAPTIVE_DEMUX_STREAM_NEED_HEADER(obj) (((GstAdaptiveDemuxStream *) (obj))->need_header)
#define STATISTICS_MESSAGE_NAME "adaptive-streaming-statistics" /**
* GST_ADAPTIVE_DEMUX_STATISTICS_MESSAGE_NAME:
*
* Name of the ELEMENT type messages posted by dashdemux with statistics.
*
* Since: 1.6
*/
#define GST_ADAPTIVE_DEMUX_STATISTICS_MESSAGE_NAME "adaptive-streaming-statistics"
/* FIXME: remove STATISTICS_MESSAGE_NAME in 1.7.x */
#ifndef GST_DISABLE_DEPRECATED
#define STATISTICS_MESSAGE_NAME GST_ADAPTIVE_DEMUX_STATISTICS_MESSAGE_NAME
#endif
#define GST_MANIFEST_GET_LOCK(d) (&(GST_ADAPTIVE_DEMUX_CAST(d)->manifest_lock)) #define GST_MANIFEST_GET_LOCK(d) (&(GST_ADAPTIVE_DEMUX_CAST(d)->manifest_lock))
#define GST_MANIFEST_LOCK(d) (g_mutex_lock (GST_MANIFEST_GET_LOCK (d))) #define GST_MANIFEST_LOCK(d) (g_mutex_lock (GST_MANIFEST_GET_LOCK (d)))