From ed04c7647dcbda820985c1440f4e9f8a083c56c50c6aafb793603a0f966ed9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Wed, 12 Dec 2018 09:57:19 +0000
Subject: [PATCH] Accepting request 656786 from
 home:fcrozat:branches:GNOME:Factory

- Add farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch:
  rtpbitrateadapter should make no adaption by default (bgo#99183).

OBS-URL: https://build.opensuse.org/request/show/656786
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/farstream?expand=0&rev=34
---
 ....2.8-rtpbitrateadapter-no-adaptation.patch | 56 +++++++++++++++++++
 farstream.changes                             |  6 ++
 farstream.spec                                |  3 +
 3 files changed, 65 insertions(+)
 create mode 100644 farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch

diff --git a/farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch b/farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch
new file mode 100644
index 0000000..0ced8e2
--- /dev/null
+++ b/farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch
@@ -0,0 +1,56 @@
+From 11dde55cbaf5179e8e1885cf1483e538a8d5a4a9 Mon Sep 17 00:00:00 2001
+From: Jakub Adam <jakub.adam@ktknet.cz>
+Date: Thu, 14 Apr 2016 15:17:50 +0200
+Subject: [PATCH] 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
+---
+ gst/fsrtpconference/fs-rtp-bitrate-adapter.c | 6 ++++--
+ 1 file 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;
+ }
+ 
+-- 
+2.18.1
+
diff --git a/farstream.changes b/farstream.changes
index 532e941..d5694da 100644
--- a/farstream.changes
+++ b/farstream.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec  7 16:51:41 UTC 2018 - fcrozat@suse.com
+
+- Add farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch:
+  rtpbitrateadapter should make no adaption by default (bgo#99183).
+
 -------------------------------------------------------------------
 Wed Feb 28 16:25:19 UTC 2018 - dimstar@opensuse.org
 
diff --git a/farstream.spec b/farstream.spec
index 20aa94e..ede35c5 100644
--- a/farstream.spec
+++ b/farstream.spec
@@ -31,6 +31,8 @@ Source:         http://freedesktop.org/software/farstream/releases/farstream/%{n
 Source1:        baselibs.conf
 # PATCH-FEATURE-OPENSUSE farstream-plugin-path.patch fcrozat@suse.com -- Use library policy compliant path for plugin
 Patch0:         farstream-plugin-path.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         farstream-0.2.8-rtpbitrateadapter-no-adaptation.patch
 #needed by patch0
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -114,6 +116,7 @@ videoconferencing.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 #needed by patch0