Fix an out of range when connection speed set to "Intranet/LAN".

This commit is contained in:
ajacoutot 2011-05-27 09:01:55 +00:00
parent f5fb423708
commit b001534687
4 changed files with 84 additions and 1 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 2011/05/15 08:31:48 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.40 2011/05/27 09:01:55 ajacoutot Exp $
COMMENT-main = base elements for GStreamer
COMMENT-cdda = cd paranoia element for GStreamer (plugins-base)
@ -9,6 +9,8 @@ DISTNAME = gst-plugins-base-${V}
PKGNAME-main = gstreamer-plugins-base-${V}
PKGNAME-cdda = gstreamer-cdda-${V}
REVISION-main = 0
MULTI_PACKAGES = -main -cdda
SHARED_LIBS += gstinterfaces-0.10 2.5 # .23.0

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-gst_playback_gstplaybasebin_c,v 1.1 2011/05/27 09:01:55 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=651222
--- gst/playback/gstplaybasebin.c.orig Fri May 27 10:40:30 2011
+++ gst/playback/gstplaybasebin.c Fri May 27 10:41:04 2011
@@ -211,9 +211,9 @@ gst_play_base_bin_class_init (GstPlayBaseBinClass * kl
* Since: 0.10.10
*/
g_object_class_install_property (gobject_klass, ARG_CONNECTION_SPEED,
- g_param_spec_uint ("connection-speed", "Connection Speed",
+ g_param_spec_uint64 ("connection-speed", "Connection Speed",
"Network connection speed in kbps (0 = unknown)",
- 0, G_MAXUINT, DEFAULT_CONNECTION_SPEED,
+ 0, G_MAXUINT64, DEFAULT_CONNECTION_SPEED,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
GST_DEBUG_CATEGORY_INIT (gst_play_base_bin_debug, "playbasebin", 0,
@@ -2583,7 +2583,7 @@ gst_play_base_bin_set_property (GObject * object, guin
play_base_bin->queue_min_threshold = g_value_get_uint64 (value);
break;
case ARG_CONNECTION_SPEED:
- play_base_bin->connection_speed = g_value_get_uint (value) * 1000;
+ play_base_bin->connection_speed = g_value_get_uint64 (value) * 1000;
break;
case ARG_VIDEO:
GROUP_LOCK (play_base_bin);

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-gst_playback_gstplaybin2_c,v 1.1 2011/05/27 09:01:55 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=651222
--- gst/playback/gstplaybin2.c.orig Fri May 27 10:40:40 2011
+++ gst/playback/gstplaybin2.c Fri May 27 10:41:04 2011
@@ -765,9 +765,9 @@ gst_play_bin_class_init (GstPlayBinClass * klass)
G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_klass, PROP_CONNECTION_SPEED,
- g_param_spec_uint ("connection-speed", "Connection Speed",
+ g_param_spec_uint64 ("connection-speed", "Connection Speed",
"Network connection speed in kbps (0 = unknown)",
- 0, G_MAXUINT / 1000, DEFAULT_CONNECTION_SPEED,
+ 0, G_MAXUINT64 / 1000, DEFAULT_CONNECTION_SPEED,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_klass, PROP_BUFFER_SIZE,
@@ -1850,7 +1850,7 @@ gst_play_bin_set_property (GObject * object, guint pro
break;
case PROP_CONNECTION_SPEED:
GST_PLAY_BIN_LOCK (playbin);
- playbin->connection_speed = g_value_get_uint (value) * 1000;
+ playbin->connection_speed = g_value_get_uint64 (value) * 1000;
GST_PLAY_BIN_UNLOCK (playbin);
break;
case PROP_BUFFER_SIZE:

View File

@ -0,0 +1,27 @@
$OpenBSD: patch-gst_playback_gsturidecodebin_c,v 1.1 2011/05/27 09:01:55 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=651222
--- gst/playback/gsturidecodebin.c.orig Fri May 27 10:40:46 2011
+++ gst/playback/gsturidecodebin.c Fri May 27 10:41:04 2011
@@ -371,9 +371,9 @@ gst_uri_decode_bin_class_init (GstURIDecodeBinClass *
GST_TYPE_ELEMENT, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_CONNECTION_SPEED,
- g_param_spec_uint ("connection-speed", "Connection Speed",
+ g_param_spec_uint64 ("connection-speed", "Connection Speed",
"Network connection speed in kbps (0 = unknown)",
- 0, G_MAXUINT / 1000, DEFAULT_CONNECTION_SPEED,
+ 0, G_MAXUINT64 / 1000, DEFAULT_CONNECTION_SPEED,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_CAPS,
@@ -730,7 +730,7 @@ gst_uri_decode_bin_set_property (GObject * object, gui
break;
case PROP_CONNECTION_SPEED:
GST_OBJECT_LOCK (dec);
- dec->connection_speed = g_value_get_uint (value) * 1000;
+ dec->connection_speed = g_value_get_uint64 (value) * 1000;
GST_OBJECT_UNLOCK (dec);
break;
case PROP_CAPS: