From aec1f2a001cde486c58c42b76feec62bcefab870 Mon Sep 17 00:00:00 2001 From: Vineeth T M Date: Mon, 20 Oct 2014 18:25:08 +0530 Subject: [PATCH] audiomixer: critical error for blocksize, timeout min/max values Audiomixer blocksize, cant be 0, hence adjusting the minimum value to 1 timeout value of aggregator is defined with MAX of MAXINT64, but it cannot cross G_MAXLONG * GST_SECOND - 1 Hence changed the max value of the same https://bugzilla.gnome.org/show_bug.cgi?id=738845 --- gst-libs/gst/base/gstaggregator.c | 4 ++-- gst/audiomixer/gstaudiomixer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/base/gstaggregator.c b/gst-libs/gst/base/gstaggregator.c index a4e1e8d716..7d59037f05 100644 --- a/gst-libs/gst/base/gstaggregator.c +++ b/gst-libs/gst/base/gstaggregator.c @@ -1420,8 +1420,8 @@ gst_aggregator_class_init (GstAggregatorClass * klass) g_param_spec_int64 ("timeout", "Buffer timeout", "Number of nanoseconds to wait for a buffer to arrive on a sink pad" "before the pad is deemed unresponsive (-1 unlimited)", -1, - G_MAXINT64, DEFAULT_TIMEOUT, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + (G_MAXLONG == G_MAXINT64) ? G_MAXINT64 : (G_MAXLONG * GST_SECOND - 1), + DEFAULT_TIMEOUT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c index 4fd8d99e2d..41de0da737 100644 --- a/gst/audiomixer/gstaudiomixer.c +++ b/gst/audiomixer/gstaudiomixer.c @@ -791,7 +791,7 @@ gst_audiomixer_class_init (GstAudioMixerClass * klass) g_object_class_install_property (gobject_class, PROP_BLOCKSIZE, g_param_spec_uint ("blocksize", "Block Size", - "Output block size in number of samples", 0, + "Output block size in number of samples", 1, G_MAXUINT, DEFAULT_BLOCKSIZE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));