summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@noraisin.net>2009-06-10 16:56:51 +0100
committerJan Schmidt <thaytan@noraisin.net>2009-06-10 17:05:18 +0100
commit79e97ec5ec0a2a798cfbf259cf05730dbeeb0acf (patch)
tree73a0591924b28eae7f6253c0c459671bf1920d2f
parent40bea96ff60c20207c2c54125e12730fa4f24958 (diff)
playbin2/uridecodebin: Fix connection-speed propagation
uridecodebin expects the passed connection-speed value in kbps, so we need to divide the value stored in bps by 1000. Also, lower the upper limit on the properties to the value that we can actually store in our internal guint (which is plenty high enough)
-rw-r--r--gst/playback/gstplaybin2.c6
-rw-r--r--gst/playback/gsturidecodebin.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c
index ef739ed5e..ff6e44623 100644
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -757,7 +757,7 @@ gst_play_bin_class_init (GstPlayBinClass * klass)
g_object_class_install_property (gobject_klass, PROP_CONNECTION_SPEED,
g_param_spec_uint ("connection-speed", "Connection Speed",
"Network connection speed in kbps (0 = unknown)",
- 0, G_MAXUINT, DEFAULT_CONNECTION_SPEED,
+ 0, G_MAXUINT / 1000, DEFAULT_CONNECTION_SPEED,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_klass, PROP_BUFFER_SIZE,
@@ -2519,8 +2519,8 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group)
}
/* configure connection speed */
- g_object_set (uridecodebin, "connection-speed", playbin->connection_speed,
- NULL);
+ g_object_set (uridecodebin, "connection-speed",
+ playbin->connection_speed / 1000, NULL);
/* configure subtitle encoding */
g_object_set (uridecodebin, "subtitle-encoding", playbin->encoding, NULL);
/* configure uri */
diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c
index 146aa9413..1ded6eadf 100644
--- a/gst/playback/gsturidecodebin.c
+++ b/gst/playback/gsturidecodebin.c
@@ -281,7 +281,7 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass * klass)
g_object_class_install_property (gobject_class, PROP_CONNECTION_SPEED,
g_param_spec_uint ("connection-speed", "Connection Speed",
"Network connection speed in kbps (0 = unknown)",
- 0, G_MAXUINT, DEFAULT_CONNECTION_SPEED,
+ 0, G_MAXUINT / 1000, DEFAULT_CONNECTION_SPEED,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_CAPS,