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

dashdemux: depracate bandwidth-usage in favor of bitrate-limit

Browse Source 
Bitrate-limit is already available in the baseclass and, even though
the bandwidth-usage name is better, hls and mss already used
bitrate-limit. This patch deprecates the bandwidth-usage and maps
it to the baseclass bitrate-limite.
This commit is contained in:
Thiago Santos 2015-02-17 10:50:59 -03:00
parent f7a1649c77
commit a48a361256
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/dash/gstdashdemux.c
View File

@ -303,14 +303,15 @@ gst_dash_demux_class_init (GstDashDemuxClass * klass)
"(deprecated)", "(deprecated)",
2, G_MAXUINT, DEFAULT_MAX_BUFFERING_TIME, 2, G_MAXUINT, DEFAULT_MAX_BUFFERING_TIME,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_DEPRECATED));
#endif
g_object_class_install_property (gobject_class, PROP_BANDWIDTH_USAGE, g_object_class_install_property (gobject_class, PROP_BANDWIDTH_USAGE,
g_param_spec_float ("bandwidth-usage", g_param_spec_float ("bandwidth-usage",
"Bandwidth usage [0..1]", "Bandwidth usage [0..1]",
"Percentage of the available bandwidth to use when selecting representations", "Percentage of the available bandwidth to use when "
"selecting representations (deprecated)",
0, 1, DEFAULT_BANDWIDTH_USAGE, 0, 1, DEFAULT_BANDWIDTH_USAGE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#endif
g_object_class_install_property (gobject_class, PROP_MAX_BITRATE, g_object_class_install_property (gobject_class, PROP_MAX_BITRATE,
g_param_spec_uint ("max-bitrate", "Max bitrate", g_param_spec_uint ("max-bitrate", "Max bitrate",
@ -365,7 +366,6 @@ gst_dash_demux_init (GstDashDemux * demux)
{ {
/* Properties */ /* Properties */
demux->max_buffering_time = DEFAULT_MAX_BUFFERING_TIME * GST_SECOND; demux->max_buffering_time = DEFAULT_MAX_BUFFERING_TIME * GST_SECOND;
demux->bandwidth_usage = DEFAULT_BANDWIDTH_USAGE;
demux->max_bitrate = DEFAULT_MAX_BITRATE; demux->max_bitrate = DEFAULT_MAX_BITRATE;
g_mutex_init (&demux->client_lock); g_mutex_init (&demux->client_lock);
@ -378,6 +378,7 @@ static void
gst_dash_demux_set_property (GObject * object, guint prop_id, gst_dash_demux_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec) const GValue * value, GParamSpec * pspec)
{ {
GstAdaptiveDemux *adaptivedemux = GST_ADAPTIVE_DEMUX_CAST (object);
GstDashDemux *demux = GST_DASH_DEMUX (object); GstDashDemux *demux = GST_DASH_DEMUX (object);
switch (prop_id) { switch (prop_id) {
@ -385,7 +386,7 @@ gst_dash_demux_set_property (GObject * object, guint prop_id,
demux->max_buffering_time = g_value_get_uint (value) * GST_SECOND; demux->max_buffering_time = g_value_get_uint (value) * GST_SECOND;
break; break;
case PROP_BANDWIDTH_USAGE: case PROP_BANDWIDTH_USAGE:
demux->bandwidth_usage = g_value_get_float (value); adaptivedemux->bitrate_limit = g_value_get_float (value);
break; break;
case PROP_MAX_BITRATE: case PROP_MAX_BITRATE:
demux->max_bitrate = g_value_get_uint (value); demux->max_bitrate = g_value_get_uint (value);
@ -400,6 +401,7 @@ static void
gst_dash_demux_get_property (GObject * object, guint prop_id, GValue * value, gst_dash_demux_get_property (GObject * object, guint prop_id, GValue * value,
GParamSpec * pspec) GParamSpec * pspec)
{ {
GstAdaptiveDemux *adaptivedemux = GST_ADAPTIVE_DEMUX_CAST (object);
GstDashDemux *demux = GST_DASH_DEMUX (object); GstDashDemux *demux = GST_DASH_DEMUX (object);
switch (prop_id) { switch (prop_id) {
@ -407,7 +409,7 @@ gst_dash_demux_get_property (GObject * object, guint prop_id, GValue * value,
g_value_set_uint (value, demux->max_buffering_time / GST_SECOND); g_value_set_uint (value, demux->max_buffering_time / GST_SECOND);
break; break;
case PROP_BANDWIDTH_USAGE: case PROP_BANDWIDTH_USAGE:
g_value_set_float (value, demux->bandwidth_usage); g_value_set_float (value, adaptivedemux->bitrate_limit);
break; break;
case PROP_MAX_BITRATE: case PROP_MAX_BITRATE:
g_value_set_uint (value, demux->max_bitrate); g_value_set_uint (value, demux->max_bitrate);
@ -997,8 +999,6 @@ gst_dash_demux_stream_select_bitrate (GstAdaptiveDemuxStream * stream,
goto end; goto end;
} }
bitrate *= demux->bandwidth_usage;
GST_DEBUG_OBJECT (stream->pad, GST_DEBUG_OBJECT (stream->pad,
"Trying to change to bitrate: %" G_GUINT64_FORMAT, bitrate); "Trying to change to bitrate: %" G_GUINT64_FORMAT, bitrate);

1
ext/dash/gstdashdemux.h
View File

@ -92,7 +92,6 @@ struct _GstDashDemux
/* Properties */ /* Properties */
GstClockTime max_buffering_time; /* Maximum buffering time accumulated during playback */ GstClockTime max_buffering_time; /* Maximum buffering time accumulated during playback */
gfloat bandwidth_usage; /* Percentage of the available bandwidth to use */
guint64 max_bitrate; /* max of bitrate supported by target decoder */ guint64 max_bitrate; /* max of bitrate supported by target decoder */
gint n_audio_streams; gint n_audio_streams;