From ee44ed5749e5163a655d0c6f214f4bb0649226d7 Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Tue, 4 Nov 2014 14:27:23 +0100
Subject: [PATCH] Adds config.adaptiveSimulcast, a new bool option that
 optionally enables simulcast adaptivity.

---
 config.js                     | 1 +
 index.html                    | 2 +-
 libs/colibri/colibri.focus.js | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config.js b/config.js
index b64085d805..1cddd4e47e 100644
--- a/config.js
+++ b/config.js
@@ -21,6 +21,7 @@ var config = {
     openSctp: true, // Toggle to enable/disable SCTP channels
     channelLastN: -1, // The default value of the channel attribute last-n.
     adaptiveLastN: false,
+    adaptiveSimulcast: false,
     useRtcpMux: true,
     useBundle: true,
     enableRecording: false,
diff --git a/index.html b/index.html
index a3a371cd2a..0def7dd2d6 100644
--- a/index.html
+++ b/index.html
@@ -22,7 +22,7 @@
     <script src="libs/strophe/strophe.jingle.sessionbase.js?v=1"></script>
     <script src="libs/strophe/strophe.jingle.session.js?v=2"></script>
     <script src="libs/strophe/strophe.util.js"></script>
-    <script src="libs/colibri/colibri.focus.js?v=10"></script><!-- colibri focus implementation -->
+    <script src="libs/colibri/colibri.focus.js?v=11"></script><!-- colibri focus implementation -->
     <script src="libs/colibri/colibri.session.js?v=1"></script>
     <script src="libs/jquery-ui.js"></script>
     <script src="libs/rayo.js?v=1"></script>
diff --git a/libs/colibri/colibri.focus.js b/libs/colibri/colibri.focus.js
index 278d85246e..87b92ab1b6 100644
--- a/libs/colibri/colibri.focus.js
+++ b/libs/colibri/colibri.focus.js
@@ -299,6 +299,9 @@ ColibriFocus.prototype._makeConference = function (errorCallback) {
                 if (config.adaptiveLastN) {
                     elemAttrs['adaptive-last-n'] = 'true';
                 }
+                if (config.adaptiveSimulcast) {
+                    elemAttrs['adaptive-simulcast'] = 'true';
+                }
             }
         }
 
@@ -848,6 +851,9 @@ ColibriFocus.prototype.addNewParticipant = function (peer) {
                 if (config.adaptiveLastN) {
                     elemAttrs['adaptive-last-n'] = 'true';
                 }
+                if (config.adaptiveSimulcast) {
+                    elemAttrs['adaptive-simulcast'] = 'true';
+                }
             }
         }