mssdemux: add an 'active' flag to manifest stream

mssdemux should set the streams it has exposed as active so that
the manifest won't use the non-active streams to compute total bitrates
or providing fragments

diff --git a/ext/smoothstreaming/gstmssdemux.c b/ext/smoothstreaming/gstmssdemux.c
index 59bc694930a145ca964386eaeb6bc0b44f9734b7..22bfdc7aca7acf5f93c00f9176de10b3f6f2ec3c 100644 (file)
--- a/ext/smoothstreaming/gstmssdemux.c
+++ b/ext/smoothstreaming/gstmssdemux.c
@@ -529,6 +529,7 @@ gst_mss_demux_create_streams (GstMssDemux * mssdemux)
     _set_src_pad_functions (srcpad);
 
     stream = gst_mss_demux_stream_new (mssdemux, manifeststream, srcpad);
     _set_src_pad_functions (srcpad);
 
     stream = gst_mss_demux_stream_new (mssdemux, manifeststream, srcpad);

+    gst_mss_stream_set_active (manifeststream, TRUE);

     mssdemux->streams = g_slist_append (mssdemux->streams, stream);
   }
 }
     mssdemux->streams = g_slist_append (mssdemux->streams, stream);
   }
 }

diff --git a/ext/smoothstreaming/gstmssmanifest.c b/ext/smoothstreaming/gstmssmanifest.c
index 80e22e91cfcb7876409f63981c2f35f6b761f5e7..71fd576a26cec984fdbc5d8d6ddd013ea7ed5416 100644 (file)
--- a/ext/smoothstreaming/gstmssmanifest.c
+++ b/ext/smoothstreaming/gstmssmanifest.c
@@ -64,6 +64,7 @@ struct _GstMssStream
 {
   xmlNodePtr xmlnode;
 
 {
   xmlNodePtr xmlnode;
 

+  gboolean active;              /* if the stream is currently being used */

   gint selectedQualityIndex;
 
   GList *fragments;
   gint selectedQualityIndex;
 
   GList *fragments;


@@ -504,6 +505,12 @@ end:
   return caps;
 }
 
   return caps;
 }
 

+void
+gst_mss_stream_set_active (GstMssStream * stream, gboolean active)
+{
+  stream->active = active;
+}
+

 guint64
 gst_mss_stream_get_timescale (GstMssStream * stream)
 {
 guint64
 gst_mss_stream_get_timescale (GstMssStream * stream)
 {


@@ -606,6 +613,8 @@ gst_mss_stream_get_fragment_url (GstMssStream * stream, gchar ** url)
   GstMssStreamFragment *fragment;
   GstMssStreamQuality *quality = stream->current_quality->data;
 
   GstMssStreamFragment *fragment;
   GstMssStreamQuality *quality = stream->current_quality->data;
 

+  g_return_val_if_fail (stream->active, GST_FLOW_ERROR);
+

   if (stream->current_fragment == NULL) /* stream is over */
     return GST_FLOW_UNEXPECTED;
 
   if (stream->current_fragment == NULL) /* stream is over */
     return GST_FLOW_UNEXPECTED;
 


@@ -630,6 +639,8 @@ gst_mss_stream_get_fragment_gst_timestamp (GstMssStream * stream)
   guint64 timescale;
   GstMssStreamFragment *fragment;
 
   guint64 timescale;
   GstMssStreamFragment *fragment;
 

+  g_return_val_if_fail (stream->active, GST_FLOW_ERROR);
+

   if (!stream->current_fragment)
     return GST_CLOCK_TIME_NONE;
 
   if (!stream->current_fragment)
     return GST_CLOCK_TIME_NONE;
 


@@ -648,6 +659,8 @@ gst_mss_stream_get_fragment_gst_duration (GstMssStream * stream)
   guint64 timescale;
   GstMssStreamFragment *fragment;
 
   guint64 timescale;
   GstMssStreamFragment *fragment;
 

+  g_return_val_if_fail (stream->active, GST_FLOW_ERROR);
+

   if (!stream->current_fragment)
     return GST_CLOCK_TIME_NONE;
 
   if (!stream->current_fragment)
     return GST_CLOCK_TIME_NONE;
 


@@ -662,6 +675,8 @@ gst_mss_stream_get_fragment_gst_duration (GstMssStream * stream)
 GstFlowReturn
 gst_mss_stream_advance_fragment (GstMssStream * stream)
 {
 GstFlowReturn
 gst_mss_stream_advance_fragment (GstMssStream * stream)
 {

+  g_return_val_if_fail (stream->active, GST_FLOW_ERROR);
+

   if (stream->current_fragment == NULL)
     return GST_FLOW_UNEXPECTED;
 
   if (stream->current_fragment == NULL)
     return GST_FLOW_UNEXPECTED;
 

diff --git a/ext/smoothstreaming/gstmssmanifest.h b/ext/smoothstreaming/gstmssmanifest.h
index 29741a314c6e9f4d9e236b82e674e8ce3349af11..6abb4e9facb453dd33e447f1703ff8a2537f2053 100644 (file)
--- a/ext/smoothstreaming/gstmssmanifest.h
+++ b/ext/smoothstreaming/gstmssmanifest.h
@@ -48,6 +48,7 @@ gboolean gst_mss_manifest_seek (GstMssManifest * manifest, guint64 time);
 
 GstMssStreamType gst_mss_stream_get_type (GstMssStream *stream);
 GstCaps * gst_mss_stream_get_caps (GstMssStream * stream);
 
 GstMssStreamType gst_mss_stream_get_type (GstMssStream *stream);
 GstCaps * gst_mss_stream_get_caps (GstMssStream * stream);

+void gst_mss_stream_set_active (GstMssStream * stream, gboolean active);

 guint64 gst_mss_stream_get_timescale (GstMssStream * stream);
 GstFlowReturn gst_mss_stream_get_fragment_url (GstMssStream * stream, gchar ** url);
 GstClockTime gst_mss_stream_get_fragment_gst_timestamp (GstMssStream * stream);
 guint64 gst_mss_stream_get_timescale (GstMssStream * stream);
 GstFlowReturn gst_mss_stream_get_fragment_url (GstMssStream * stream, gchar ** url);
 GstClockTime gst_mss_stream_get_fragment_gst_timestamp (GstMssStream * stream);