summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Adam <jakub.adam@ktknet.cz>2016-04-14 15:17:50 +0200
committerOlivier CrĂȘte <olivier.crete@collabora.com>2016-12-22 14:29:00 -0500
commit11dde55cbaf5179e8e1885cf1483e538a8d5a4a9 (patch)
treea7963846bd349dadb3cdc58c23f65e6b0ad987d7
parent433898b123957ae1319da579f356bc1f1c989309 (diff)
downloadfarstream-11dde55cbaf5179e8e1885cf1483e538a8d5a4a9.tar.gz
rtpbitrateadapter: should make no adaption by default
Description of "bitrate" property says 0 (the default value) means the element performs no adaption, and so one would assume it would remain passive until "bitrate" is set to some nonzero value. However, when "bitrate" is left unset, the adapter instead requests video in tiny 128x96 resolution on its sink pad. In order for fs_rtp_bitrate_adapter_getcaps() to return peer_caps by default, the value of FsRtpBitrateAdapter::bitrate has to be initialized to G_MAXUINT. Also fix the comments to say that MAXUINT is no adaptation. https://bugs.freedesktop.org/show_bug.cgi?id=99183
-rw-r--r--gst/fsrtpconference/fs-rtp-bitrate-adapter.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/gst/fsrtpconference/fs-rtp-bitrate-adapter.c b/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
index e8684fd5..99ea03a0 100644
--- a/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
+++ b/gst/fsrtpconference/fs-rtp-bitrate-adapter.c
@@ -55,6 +55,7 @@ enum
};
#define PROP_INTERVAL_DEFAULT (10 * GST_SECOND)
+#define PROP_BITRATE_DEFAULT (G_MAXUINT)
static void fs_rtp_bitrate_adapter_finalize (GObject *object);
static void fs_rtp_bitrate_adapter_set_property (GObject *object,
@@ -105,8 +106,8 @@ fs_rtp_bitrate_adapter_class_init (FsRtpBitrateAdapterClass *klass)
PROP_BITRATE,
g_param_spec_uint ("bitrate",
"Bitrate to adapt for",
- "The bitrate to adapt for (0 means no adaption)",
- 0, G_MAXUINT, 0,
+ "The bitrate to adapt for (MAXUINT means no adaption)",
+ 0, G_MAXUINT, PROP_BITRATE_DEFAULT,
G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class,
@@ -161,6 +162,7 @@ fs_rtp_bitrate_adapter_init (FsRtpBitrateAdapter *self)
self->system_clock = gst_system_clock_obtain ();
self->interval = PROP_INTERVAL_DEFAULT;
+ self->bitrate = PROP_BITRATE_DEFAULT;
self->last_bitrate = G_MAXUINT;
}