diff options
| author | Thiago Santos <thiagoss@osg.samsung.com> | 2015-02-17 10:40:06 -0300 |
|---|---|---|
| committer | Thiago Santos <thiagoss@osg.samsung.com> | 2015-02-17 11:12:42 -0300 |
| commit | f7a1649c77ede1feb15fd80cb4f78994f986a0f6 (patch) | |
| tree | 09359e5073f33e116d308cf8ab7c605cfd97ae16 /ext/smoothstreaming | |
| parent | 00bdac51a30e35d9c77d8d9d0d915f282771036f (diff) | |
| download | gstreamer-plugins-bad-f7a1649c77ede1feb15fd80cb4f78994f986a0f6.tar.gz | |
adaptivedemux: add bitrate-limit property
Move the property from subclasses to adaptivedemux, it allows
selecing the percentage of the measured bitrate to be used when
selecting stream bitrates
Diffstat (limited to 'ext/smoothstreaming')
| -rw-r--r-- | ext/smoothstreaming/gstmssdemux.c | 18 | ||||
| -rw-r--r-- | ext/smoothstreaming/gstmssdemux.h | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/ext/smoothstreaming/gstmssdemux.c b/ext/smoothstreaming/gstmssdemux.c index 865e1059a..5c163d857 100644 --- a/ext/smoothstreaming/gstmssdemux.c +++ b/ext/smoothstreaming/gstmssdemux.c @@ -85,7 +85,6 @@ enum PROP_0, PROP_MAX_QUEUE_SIZE_BUFFERS, - PROP_BITRATE_LIMIT, PROP_LAST }; @@ -173,13 +172,6 @@ gst_mss_demux_class_init (GstMssDemuxClass * klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED)); #endif - g_object_class_install_property (gobject_class, PROP_BITRATE_LIMIT, - g_param_spec_float ("bitrate-limit", - "Bitrate limit in %", - "Limit of the available bitrate to use when switching to alternates.", - 0, 1, DEFAULT_BITRATE_LIMIT, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - gstadaptivedemux_class->process_manifest = gst_mss_demux_process_manifest; gstadaptivedemux_class->is_live = gst_mss_demux_is_live; gstadaptivedemux_class->get_duration = gst_mss_demux_get_duration; @@ -205,7 +197,6 @@ static void gst_mss_demux_init (GstMssDemux * mssdemux) { mssdemux->data_queue_max_size = DEFAULT_MAX_QUEUE_SIZE_BUFFERS; - mssdemux->bitrate_limit = DEFAULT_BITRATE_LIMIT; gst_adaptive_demux_set_stream_struct_size (GST_ADAPTIVE_DEMUX_CAST (mssdemux), sizeof (GstMssDemuxStream)); @@ -245,9 +236,6 @@ gst_mss_demux_set_property (GObject * object, guint prop_id, case PROP_MAX_QUEUE_SIZE_BUFFERS: mssdemux->data_queue_max_size = g_value_get_uint (value); break; - case PROP_BITRATE_LIMIT: - mssdemux->bitrate_limit = g_value_get_float (value); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -264,9 +252,6 @@ gst_mss_demux_get_property (GObject * object, guint prop_id, GValue * value, case PROP_MAX_QUEUE_SIZE_BUFFERS: g_value_set_uint (value, mssdemux->data_queue_max_size); break; - case PROP_BITRATE_LIMIT: - g_value_set_float (value, mssdemux->bitrate_limit); - break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -482,12 +467,9 @@ static gboolean gst_mss_demux_stream_select_bitrate (GstAdaptiveDemuxStream * stream, guint64 bitrate) { - GstMssDemux *mssdemux = GST_MSS_DEMUX_CAST (stream->demux); GstMssDemuxStream *mssstream = (GstMssDemuxStream *) stream; gboolean ret = FALSE; - bitrate *= mssdemux->bitrate_limit; - GST_DEBUG_OBJECT (stream->pad, "Using stream download bitrate %" G_GUINT64_FORMAT, bitrate); diff --git a/ext/smoothstreaming/gstmssdemux.h b/ext/smoothstreaming/gstmssdemux.h index afd750853..cc5ff7f57 100644 --- a/ext/smoothstreaming/gstmssdemux.h +++ b/ext/smoothstreaming/gstmssdemux.h @@ -72,7 +72,6 @@ struct _GstMssDemux { /* properties */ guint data_queue_max_size; - gfloat bitrate_limit; }; struct _GstMssDemuxClass { |