diff options
| author | Philippe Normand <philn@igalia.com> | 2015-09-07 16:57:05 +0200 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2015-09-17 17:39:27 +0100 |
| commit | 261d8daca06f4852887e519b7339ca670dc42a79 (patch) | |
| tree | 822a7c88fb8ddb91111e8bdc6f4f1fe245d4824d | |
| parent | e990e75e1e9a1493b2d69552bc02f4bef52dbf73 (diff) | |
| download | gstreamer-plugins-bad-261d8daca06f4852887e519b7339ca670dc42a79.tar.gz | |
adaptivedemux: prefix the statistics message name macro
Keep old define around for now.
https://bugzilla.gnome.org/show_bug.cgi?id=754686
| -rw-r--r-- | ext/hls/gsthlsdemux.c | 2 | ||||
| -rw-r--r-- | gst-libs/gst/adaptivedemux/gstadaptivedemux.c | 4 | ||||
| -rw-r--r-- | gst-libs/gst/adaptivedemux/gstadaptivedemux.h | 14 |
3 files changed, 16 insertions, 4 deletions
diff --git a/ext/hls/gsthlsdemux.c b/ext/hls/gsthlsdemux.c index eb238e1b2..91178e237 100644 --- a/ext/hls/gsthlsdemux.c +++ b/ext/hls/gsthlsdemux.c @@ -1059,7 +1059,7 @@ retry_failover_protection: main_uri = gst_m3u8_client_get_uri (demux->client); gst_element_post_message (GST_ELEMENT_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, main_uri, "uri", G_TYPE_STRING, uri, "bitrate", G_TYPE_INT, new_bandwidth, NULL))); diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c index d43fdc953..9f74c658a 100644 --- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.c +++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.c @@ -484,7 +484,7 @@ gst_adaptive_demux_sink_event (GstPad * pad, GstObject * parent, gst_element_post_message (GST_ELEMENT_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, demux->manifest_uri, "uri", G_TYPE_STRING, 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 */ gst_element_post_message (GST_ELEMENT_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, demux->manifest_uri, "uri", G_TYPE_STRING, stream->fragment.uri, "fragment-start-time", diff --git a/gst-libs/gst/adaptivedemux/gstadaptivedemux.h b/gst-libs/gst/adaptivedemux/gstadaptivedemux.h index 3876dc645..09de08ae0 100644 --- a/gst-libs/gst/adaptivedemux/gstadaptivedemux.h +++ b/gst-libs/gst/adaptivedemux/gstadaptivedemux.h @@ -63,7 +63,19 @@ G_BEGIN_DECLS #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_LOCK(d) (g_mutex_lock (GST_MANIFEST_GET_LOCK (d))) |