From c1a909250505df06501744fc2121713a7f0d168f Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 20 Feb 2015 14:47:10 +0100
Subject: [PATCH] Get SimpleWebRTC conf from the API Instead of printing it in
 a JS scriplet inline. Also add a modal popup while the initial connection is
 being established Also make the max frame rate to be configured

---
 conf/settings.ini.dist         |   5 +++
 lib/Vroom/Constants.pm         |   5 +--
 lib/Vroom/I18N/en.pm           |   2 ++
 lib/Vroom/I18N/fr.pm           |   2 ++
 public/img/connecting.gif      | Bin 0 -> 9793 bytes
 public/js/vroom.js             |  38 ++++++++++++++++++---
 templates/default/join.html.ep |  73 +++++++++++++----------------------------
 vroom.pl                       |  49 +++++++++++++++++++++++++++
 8 files changed, 117 insertions(+), 57 deletions(-)
 create mode 100644 public/img/connecting.gif

diff --git a/conf/settings.ini.dist b/conf/settings.ini.dist
index 485ae1e..7d0a3e2 100644
--- a/conf/settings.ini.dist
+++ b/conf/settings.ini.dist
@@ -20,6 +20,11 @@
 ; the realm used for turn accounts. Must match the realm of your turn server
 ;realm = 'vroom'
 
+[video]
+; Define the max frame rate for video
+; higher will produce better quality streams, but will also require more bandwidth and CPU power
+;frame_rate = 15
+
 [email]
 ; Address set in the From field of email sent by VROOM
 ;from = 'no-reply@example.com'
diff --git a/lib/Vroom/Constants.pm b/lib/Vroom/Constants.pm
index cd6b13f..8dd8234 100644
--- a/lib/Vroom/Constants.pm
+++ b/lib/Vroom/Constants.pm
@@ -122,10 +122,11 @@ use constant API_ACTIONS => {
     get_room_conf    => 1,
     get_peer_role    => 1,
     join             => 1,
-    get_padd_session => 1
+    get_padd_session => 1,
+    get_rtc_conf     => 1 
   },
   anonymous => {
-    create_room => 1
+    create_room  => 1
   }
 };
 
diff --git a/lib/Vroom/I18N/en.pm b/lib/Vroom/I18N/en.pm
index 813f099..015047c 100644
--- a/lib/Vroom/I18N/en.pm
+++ b/lib/Vroom/I18N/en.pm
@@ -229,6 +229,8 @@ our %Lexicon = (
   "CLICK_IF_NO_WEBCAM"                   => "If you don't have a webcam, click the following link, you'll be able to join the room with audio only",
   "CONNECTION_LOST"                      => "You have been disconnected",
   "CHECK_INTERNET_ACCESS"                => "Please, check your Internet connection, then refresh this page",
+  "CONNECTING"                           => "Connecting",
+  "CONNECTING_PLEASE_WAIT"               => "Please wait while establishing the connection",
   "HOME"                                 => "Home",
   "HELP"                                 => "Help",
   "ABOUT"                                => "About",
diff --git a/lib/Vroom/I18N/fr.pm b/lib/Vroom/I18N/fr.pm
index a45c954..1100c2e 100644
--- a/lib/Vroom/I18N/fr.pm
+++ b/lib/Vroom/I18N/fr.pm
@@ -238,6 +238,8 @@ our %Lexicon = (
                                                    "en audio uniquement",
     "CONNECTION_LOST"                           => "Vous avez été déconnecté",
     "CHECK_INTERNET_ACCESS"                     => "Vérifiez votre connexion, et raffraîchissez cette page ensuite",
+    "CONNECTING"                                => "Connexion en cours",
+    "CONNECTING_PLEASE_WAIT"                    => "Veuillez patienter le temps d'établir la connexion",
     "HOME"                                      => "Accueil",
     "HELP"                                      => "Aide",
     "ABOUT"                                     => "À propos",
diff --git a/public/img/connecting.gif b/public/img/connecting.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c3e9d00ba6cf857da13b7adec2697ccb54a85b84
GIT binary patch
literal 9793
zcma)?WmJ^i!>{itm>CcOX;Ep0lon8NKw3aRT0pu*x?||Bp?ikzl&+yeP(TGFhwiWt
zljHNg>pkcBpS8|f=l;IG{nm9~>)KmMMNv}990Op0App3%y!`g<+v(})&d$#2>gwFw
z+~nls@bGX?PftrrOKoj!X=!Qpe|_=s@!{d&?(Xh3Ha34x0sns=>m`|ng3gnNvYHAa
zf<h3`-&3sLp)fc=4e$d12nYs(004H0<4Cl!FR-h^4uE?a+-p3Zuldwnb-8-G6X&Ab
zeLq0?q3gKQDpI**P^DJynpTPDD_V=@o;n{M2J+BnXO5F|2<rF?xtK@Q?ii5}7T{$r
zh}1RARrHRRnIr)5PY4JKeh4KCPX|Xi2uXqy6Ct1!S!j9*A}gEn4k*7S6EB%ok`9xI
zHoOyGlaH$xhcuOtb@R1qNmO^{*Y)uA5z;+|Dk{a|#`A3_r{1KKz2X@*63d$}SQKkq
zc7=<r%e?Q{_FvoOh8=`|Aifp*`02-2!g^dWnyHF*Z0nejjxwS-<mLGdo%MQVLL`ck
z+=@lbf{PYGD>4+#mfvZ|wR{;NYp%|E3oAzMWQBeauBwh2<LQPsZz(?EcCM2G5w^Pv
z#1x-z@yMdYuhG^EE9AJbC#U^V3s1X)J%|BB*|9EuYz|G8rjOuE3$9LjbczVH1s8!3
z0)ciGE!mCjJf#w#ovWe3xllon)ZB__meHPswXp%u7zqW8PhmK@=A>bNNI#F78-!P`
zDY|wWUEE&t==K0K|L%2{E1ou+v%ymbRmN;d?>Z!qLy7t5BV>ZpZ;dp}52j;kKkZGp
zP`5OAb#gEkgSC%^uhcY%lCB{xkVEgQZ}|wy?x1It-c8#VOm@c*(q5FT)#C{6Glb+3
z2!p<`ZJGo11)csS`#GMl7KB)~d4oQRpAMx#%|s<2X9U_c1+Jb%0d`0t`%N9TT1C@X
zaX9@(Q1kl{^$2OZcG4#ozCP>}@b0m~U``f#a#iurJJ?WZ-c*R6j2^u?f>Te<l1f@i
z?y92-@BRo#z3dJf0zQNVLKTcuz!`=T*bkJDFALi)BMDjz50%SQ2sw{vfTi60VMdii
z6$-RXg4(BS27hCn>}}wR2rDKxlA?1s_L8M@2=MRasid{v_z)Rq;%ualQKU_!oEq38
z$0L#O=i^>nX%16n`B%zhdr$e^qCMxvpq!ibyUFv89AFp5r5KANzv5C*OQivLED?{Y
zwKqf&E*mV2ZAhBmdmSFP^`x1Pv~OiNo^&ikQWIK^S`SaU&X7Xd0PLOPY0t$@^=Z#?
zZ)jQm!kOG@FO)v-MPD$0Y{&^BH#-|7Q93*rn3Z)B?$@bZtc22g$KTeac{SKL$`Qu=
zNt``(xpAEP5Zg3C*Sze;eS7d%!=&gPHV{bSAwR1c({0`m;QoU=XL<?2$+$s<Q$FEF
zsaw{pZ`7B5YPVbpstL3kdmnqYMt&_ho-?qFbfJG+u<~f`7D>rbzC)W9clB4)vhpou
z&#cKAtD~W|YfjwPzEP|Ai%4GcDlAo>zSFumysUUbPzCFAN!9)cOEzP_BW8S4N;E!d
zRO(U--=&s0mw1@0v|kIY_S{zR=_RgJ(U2@J-NXix9~LDw{Aeos@j2nBx!{T~&O;IQ
zlXCRgcvpr5hfEjZ1(|C2uF1Mg&y~gN!xeg;%yPvN-<;Y#{BHH6s`Ur&;<!_J6>ShV
zqVIYTmv!wy5AkPOHA_zp``NO{mUjz{N4?DQE0Y5XI~hccvYD&O%B2KN&xS6$Amy)7
zxER;X4Pm=$L3azkm6as}7Rmm62k8wuu5wgD$xvn}e#5~dBWO4|oK18+q|7p-y;Ojd
z+$opL1bpMPRD;i^tDxOaT()w(ff?mC-mtUPN=4TguJ18U)uWwu!-gtWYk7RW*K&C1
zb`g0%;b$h$XSY!LjM8}HF4nKn%4zM>&K8RHY1fzR<XyxYG44Y}54-njS@dj@p4qd`
z(Tpp}QiwcQ!CGqU*)b}zStlIHZn1keDNOgfViT=mMotW1;Gh?<9B3&+r5swN)Gd|n
zW9%=DFB9@eE`g(JS%I~&^q29cBwg~G;>sPcBTy=~vxc=jO}EPI)2x~aS^QV4tU>iH
z3*Q;?>y#-{BX1*`ayvJ;B;U78xcW6Q7mM0vpO?LMfA?5@e_0Oxe}UZ!Q2aO8GsXtG
z>$U#@yCiSB%Nv#soQvJ&cR$f0Hy#e=BxIRKr^vmecQtxeJ?E`NEi?<IS5N(!go|eT
zwecm!d@>G}3kAdbyzQ6HuHx>dk{}A77)m6_0fNA!NQUc6lEr3`nn6<Xb0pFp-+^S6
zl08k%Pl4d<gziL_W<d?XRr%<!I{UDuvX-{|P#(O280czm76qXngGkWrA{Y0bh@CWq
zzs8V=4a<mu=d(I=@|J`Bhu(^jZ^c|Sd%lm{K@p$vLeFAWpSB+Gm<>D6#~Pe9g$T1y
z8p-POl7AU|_(;9VV^Dd^KZ1=Q4==yCpkkOBQZ(hRx%|2*YVow^G1pQ)!yRGJBdWcF
z+PA2;P&v0x&at@6lhx?dcWP(3St&_q7_BdpSV~Qy9G+UStl1D;iGbenUW5x_01yZW
zHQth#<U=G~E8b$z#MPNJiox$4FFpwmO_GH!+%U$V$C(7*_NNi)c9n|70Lp@UEYA}#
zU*RGrKR+93GJ9}8A>o`h-UQz&UZtGs1Xiy-Mo7DI>dWc+sK~b2)G|frISVBit2Dh_
zJEZOM*4Jy4V3@pNI!VhtDz5ZtYm{@#<NUEahEB#RIV<S-*w@1-6%L9F6NSDL_cz?9
z0^rXA7pY?=SLDz^pSGD+z){rHJP)4*{5j^DTlRA%Dh+X#zAKXleshj3nUj<>Wzj%>
z>EzRd8jj`I+)4LjiDHXYWYcrd$tp6*XdEMrxILF%5N{rywUHnhNtF|E@0=krZZ{ug
z#Q?gX-%4@VTUd-$v-nzUr*%_h)9P4v9GhBaZ)gpe`SI*zS!MW=Guo9^?&LTj8%nad
zvh3#aJm&0o^Py;jEdm&e*)7E6z=#E0aLPS=h>c-cVYGyFc|o`|uYG<BulRmxdWH*6
zS$1N>eo4OHkIG{Fh8S;A@`=iNWk@fg9AC3hiORDYR^0{aau~t?$7JAtO~w_F_}Aba
zNEC~@Z_8EuV=|^)F7*umn2Z=}z?ke`lgS`a<`__^B_aFAWYo?7n#=+n9NtHq_X%X9
zS%q0s<Wn%wk&mQ3hmaF7Zg)J)q>;YS<fH+-U`!IsCd^()3LX<f28-uPOvZ?&rXeN4
zS>^tDY=z0-qBKcFd3k6&s3sYZ2saFCuBf7JYY*uvE|Ku*i$U}c4!MjJOOU+En(Cj%
ziFa#_&&A~S7c8cTtr&@A5`D?~*`2rXrlVqzqv(y(H;Z*&-ttnc51wlb6}rJZ@aWx#
z3ZMXA2U>ZC-CH#@6APuhcF9G<(x|F+_t8e^urJr)B_1;dD63F!y;M;}Oo!K`+*Tjr
z^A0s<xb}^uXtD!|e?Tq6mpukgWSOBNeFe%=6|ZDU<+nAW5<;_4#8TI?vG>1QEMkGq
zmQg0R9s{)!7IJTSTZcf=9PZ3M0RA>KkRAN;h8p2eDjao~C<LQ&xdNv6rRsGLBeY&D
zej$6e%3w&{%UASvvKrHXT5AU4Dxt=ryp<{+(I6JUCc8g729&J+_R7=>E7ndoX`LZk
zTPiidujcz<257YKQ+Kh78kzwvcNG+amO`LAL_~u`NES2+CCF(^n)yc_fGuy{zPi?(
z(oHQ8z*5l?WN63!5oW*;NSry(SCb?6j@`06W2R^E-k@SAaOXo?5~YaouxpU3GIq(~
z>k0HL?DTHMX7Zd+v!_uYYO!0<8DAAc9bcqH4@zg{i4TDIWh&OAgg%}B{j*r<hXaKz
zVw+y~*>-{FARRg@hs~INT>()19EaQ0mr-E-Cq{alw?IN2oc0<sM5U~7*OKjQtguko
zeWxm2$~>%;P#T3+(>PT@ps&hM9Q7ZBZH`(EqA0;6>jNI*F2c$g$a!UY6XNeCyziXS
z^wB0@xK_5}sXXk0ojbSH+DeEo<9zE;U>PU7R-xP(5cYWc#|;RDB+DKp>%T~U<L~e-
z{!RK#%^H4IoD2UOj~k>;uPMAvFVQj120pN)F&w6XouhC%J2pGcsGi4x_7yEC@yT<1
z9E=>k7cxUP_XmlH7@%ZHg6`e(Q+Iq42zLubTAF}t{rv6+sof_D3qxq=gJLr7iO0*|
zPtGUNkIwM(47A{rAkEJYP$|mHE{o8vD$uLTs6pjC6c2eBM%vou2YDvaB`pT)OYYag
z4??qq$DZDCoeWLYOrP=9ZWK-W;08CC9(>!mE)3oZJ<wY9EjcU`>D_v5;Pd$-=X(Q9
ze{SyiW?w-w=sg(ZddFj{A5)?>7I^+^uU0u5*ug8c!8bl+!_mo<N{E%6%MaJW*xuiD
z=jQbBfX!|oyrHsgAdJg(L@w7S>m~Xp7B7R*DwHV3Yb<hlDoT=*UMW*RzNjCVhKG&4
zBS8kqZ-({?d7}n@uaK_!>8KHEwTbo2r8V!V5FGD6;%qw&y(Oxk{zw{E(tnL)<ox(i
z8p-1>wv6ZxTxpE*j8K}}roRU5I;qOyi2+KGlbyF_^xv<CgiXAh(XnQhRL?z1N-GSe
zQ1MZ+ByVhSwA9@b7}GJ5Cbgpo@{^3Wi?S77dI|=8CI*N2ye=jg$83hVF}A<{C1Pf*
zH6mMu%nLXk$)}Pc#m-wHVJD8<(W~zw0lm3x??tfgS9(|wSg;k-=}TfnWftnjs`)rf
zpFa}^{;b6S4Y#JPz|%5|T(HuWbz~C4+1*$%{$y5J7SvZ~6^U`b4aXP~ND|vV1W8IT
zutRLVR;&YXj$}-f99QKQR!tEUm7=N0vz?~H_Q48y6^+}@F!tKt&NPxCS|oun_B+|n
zK9z5Q?OJ1Oy!5feojjWnLvX&2mwkDj?|H{AJn+Z&a%jko6bc_P>stYd>D(vaNyHY*
zqFtMKc(PpNCiY67N&{N(|HE;qzjIauEdQJ1paFE=E@iaSVej8L*T<}eqfY~FEwwLA
zDDe+~`-y}xD<rnR?A^EU)iML4_kI(8=1-legiu+TYx)bSP|C@(0U+6?7C+>6udaG6
zRR-iAX7?;u>;8){|A(eglJ~)J;r2=TcY)L}Xu2`#o?nhjUSxsE-6H?M#Ih36*h-tA
zTCvbZo9db}v4+aJ(k>Bf8!UlPAd)>4k>4+bZ}jwfDLmvh%a&0n)Kj_e;hkV>TSxP2
zfw{if#d3kcwzapr>~oVk;BB*Yw&_&`D4YhaX7&cw^=#8(JC~J+Aw+@6CLWFy<)YX~
zSRB+?_?Np3Mr>%5agA0X49fQ|X;n#i&BilX4S^654tyUYh`D#!7d@iJT<zq5jdm{A
z3K3RFzNjpUm{zG*zA4_B4DVn78*7xtZf~-AvVpCZ{n9My>f=pmSh~J$Wd_+AQzlQ$
zRV;}qZwS3I`eygW2L$e7So+2ZF8at}CqORTzcO?iE*fM9d?N2mrP68PxA=q}%DekG
zh*>)Fb!YIS(~4?C&#U8iuVFj`zoYCID||L=z(3DUxWMGhlE9C)kDFtcj0Uf}J3jAD
z+Xi22z=V7~TxfP&a}Mm^5qsYecPnY-t`&6aZK@I=)&1k!2YPhm;|D)~{kS;YEUyo~
z{Q2ikDQPwsR8<aG!DzBpN1xB)%2~XRTwCYD7I+9|ZVWak7>Hbwh<0Fl-2gy2uor{~
zR@G#548I%^?K%dV-iSwXM65@PzGg6whHUL^LS}#OV3Ope&+;ARxe&5o3ARcrEX&Dx
z36=sn&Y1XwdYq6Fb0ymvt9BB(ohc<lX>AYnQL#z9ePTn%k-yo#6zlTZj?Nh@q-h&B
zN_9pk;4orj0%MRyIbcsW!yLdtV;>z0`z2Lc)IO74lE>2|v=g7*n{1PaDzn3sa6~Td
zONfU53)LzB{I8+7{EwsXARw}E%zm%SQJKTkgwG$O=VNkEzUD3;GIET*cHxn<5~%Fs
zzOkw<gcs|5Y~3P_X(6LatX~tUJ0z>JwzdE9JGRNu<HE#q^7Q;c&}{(27b=Qzk7AE-
zj$?OKi%p6UNJ_>8DueRmjJ;DO!LX8&9N~yuXlYG(v_C!!Qu7j)A?W3A)6&vNoubgo
zQQX}vl<qh@485H#Y%wu2g%ci{nMmXyh=1S!%@bGHI^3p+L?IA?YkGHnfLpC@?quRD
zOJcS9>jZQ|`S^m?eLFmvVDZgkQd&8V@kV6LukRst2b4qMkI&z`U+g{Y2@a(*W%t=%
z;pBXUzAX5q8@Htz7+^Y)r{YecV9H?5qDg2je^ZDK`y_wHfd=E1Q~#*ps3Sq8n(0i+
zZemrsI0V*s<;N4g`Fhhn=PP`3ydRo0Q;+1y(otBD6Ml!|qgdT^<zteXmb)I#Q+>W)
zxRf;k7X*}?n%k7{u^u#>%*f&5>n6K3M(V)U%j_$=o(YzWGbPTefM+V2P35L?K&uaH
z4gF=Tq$C_*rPfZZ35x<ZVBOYzLDg(aC&WD4Tvq@u1%1y(WP7a6I04>WpiM(*`v2IT
z6rwP@brs(jJ-T}PDmQDvJulMs#PVln1NXmwP3|l&lqbmerZ1O{0>OV0NLR>6OSm<v
zgJBl>`A|hxZx+N=u{~yp6eaGKBMYq=-hD@^W!+m?=-WEv;TS1npfLHFxqI)n5Wzk(
z!Y&kiTW&gy3?yh%OeW=!IRwa;Wo?Fe=v=S{+!nrAx8=*WV~xdaORlpcw%XZmNHw)%
zK~jHE(P>viI<Tp98*OmNZJCBrCh!)+Ca0mGR4Uf`HMA_kv{$|?(BkHXMM&U;M}DBg
z50!%CNEJ<PC>hIl`Tt<^jlXQR_@Dj$t%b29kada>-Zvfst<D-lUZ>UIe3vsmCYU5%
z!^~;cU;+gq*5m*x`_mKY&=w<ywrm*R=t$G|_*V0I8;jiYh_GyT+IK;3s^0}jy9IH3
zhNudKqcBkrpIENQC@F|VGFQA;SSELB+Pyqf0W=98myl7$6OdblcC4)v$u4QSk1cGK
z!NzndKnS?r!J%O#!r1u4tI0$>2sShO_TBrrw*x`*OUrY~kd^h7M!SujrP$qrcl(DY
z$0rA8A9p@~S&xN&+knP`f3B-;gGkSqI;3Qg8r9Y{_=kL83gx43nvozFgD{(<K_hx3
z2}z-IF9qNj1G6h#8jB%BK*O>8mTZ*DN9f61(x&g7<4-^n7WaKSIrK#Krm}nWn0oBd
zwkYVMh(BNG<HKhw_^G;`*jYef_2lHqlmM-xTFP@uj7gl=5T?jRU87dptbehq@!m+f
zV<};!52<Oql1qqP>GR%A6zI|isZ)XJ&{=99WS=4+l$R#BP{6o3iB$8ZdiLilQ^CVk
z(~fk*kl6-ZTgAZ4$f=4<B^u0?rT*x_mwjwFVT|iz8idc_O<9%;qeM<*fK8>3yxVrM
zijU`Of=5FCEi(4eg1~U#<XJVO;|g}u^An{iGx~Hz@nbv!*T?+=>~pp(4rd{f|1`G^
zeYVG=jjMCxzEH~b@#P;|LNvR!(K1mBDp3apSt&0f_abOn15!)PfGBq#gPTZ-A_?Q`
zyxOfs(bKe4mNC32%*}9<Wrnp|tX1>jNum|QCV_gCJP!c@2d<I?jz4xYiIym-hpE9I
z4I<J-SQwV$j9qvJy<Waw2+KkT#F(euXXyBls)*wWOY{aYaOKJ{xG;b<R#YrhsmJW&
zal=O>g)cC@iUkflF_Aa0><V+&i+Ljcg<xht>aSe<M;ECJA^xKm{SIqBG8FQsmjqnH
zooU7-N#Mnp(;pI`#6y}|vR;GF)6v+XkHF>~0Lcy8@;I10saz|SxUP{o_QvyKB`?_j
zo0>(SJqV*A9_FAIDF=>m0R=}wqLVT*v$AuZM%+)##c@JlC8dS<+~U$|XnI8kP~B9b
zS)WnW+*ID`3F_#B)pa{S34OJLFGfaM#w}mH>Uym`{c7y3cKiF$1?}ObNv#zg!6M>}
z6^M-Th$7UA6!{4W<A~TL%s&B99Q~mr3s(^qsyDk&4L$?;dt0sa1tTgbl{FiR#1M-#
z85UV#gux`TZe8XWVE9f#Y02f6pBKphbu2rd8_hZyCr^k3dBd+U95fV09!gRgCA2dZ
zz2&r_LuIzBM5>EH=1<^C;2=e%n`$YpODRx|TXM9l=?Cw^44U<fRX41}Go_*7fp%yp
zsM&@#9*t`?Gr5lFVKNt*UkjrmIm=m@X(KAonAlF~tTzgE)yB|1=A^1`1XoM4m5Y5M
zh=ez?i8xXi4K&|tmpqyBs{x1D!%ubU1+@s`v+bSnV&b)#;m%WBW)iDa>=<_rq;sxh
z-2xOek6ai?abyzPcrW+(>}vpVc48o^Jk0hvTkY=ng!7<8Z|`o*>x7<Np6867hy$Ne
z%nf%Bj5X79Krm8n_C>*O#Zi|Gsf%ZUyr}v4XC9JP*+_(T=>V`W)2d*dVeTUrmHU3j
z$k!$BPG&H-c15UvLjRrQ06rXpX=2^}C@eVQ!zezU&!A#1fPIx~!~1ZBU}njmD7#@y
zU4&!zmx!O&Pcv5A*YT60>HtS4WREGtNE-8$T)D7r*`k7VXNBcR8^e|IG(Je0r@Awx
zV+wTSziGMJ$NGk4e5O>60tEH4i}4x*Ry!<lEV8?j4#u%Oj5*GW+kWAG6AFg0JiJvj
z;AGYGr1F!`*L3C0nf{}OsQgC_$&mM}b2@B#$lUF5On0^9Vbt*@o2-Lm7AUDY#B%hA
zwUBGw#VDK&f-Ix6cqvEvR!Elkm9=$A;X4oQlX*coik=&UkdyA;8r1yzb`${;X1;!a
zHwb}=_YZT8OtG>ijn9B4-A>8XeGCoGz+`0$MC3*$%7Dr7_!7bA<rUFlv9)+ay<l0B
zU#bA9dm9GX$pIRBDch50!l^nKPf^SUCnG0E^jU+Tur*jEb@!yj28e7Xo`e&*a7qrh
z1|Y=q-L35>sUX~eQHLrEhV%vKuEaStolC1);dPO?KlbJg>O(*%!}bj-oDi!x^%v&I
zM)s8Puq2M<OLGoXouX0%t;!Z3H@<`-fg4#f=`)E2!_XmY7YxKwIcsj4i7K8(gE+^#
z>oA&+q7}L@QcfCizpEL_z<!ZbwBZ0+C-e!Gu}POLpT5g&Igw^|vxP9Q*lX&cyUxc(
zc`uIf##HD^1|vh4_Y4*ExlB~BUv)S7h0pFp@<SOk8mDG0ndq-u7SkCv=~A!qf3Br+
zv@(=_8-RX(Pgl<VEjp=E5Z#(~ebU_f-q?Y*SnKmP*9S`pFEc7NxZwOQM4;ShQ$vyC
z&T|XzN0wp~43{-Gyr)rJ{Se{TW}d#EH69(^tSL|k{V26QI$zuA9r*4jur1$;uf*m<
zu;65w{?2m_@;!R8Ro3=U!x3|m>>wc_Zae~6ppX~9AXl;IeJMQ0;JXshE@z!#SYc{c
z)RD;+;98+r==UwA^;wWuD^btvPft;*D@U(w0T&b7g1OFIEs<z-`-pCfUFe_%6L+P`
zAT|N6x6gXzvFSF}`VMwuTLUFmVNJ&Grpv+e$bzFd=l-l2PRjr*M+lV&_cglm!0XEn
z->ibTb%tlC%{zQ&bd;8tSzU~kT-aRs*j<v}#9iM9?>?)SQqz$f#49=59bCZ{R2@Xb
z)EyiEXX5(@RSxSC2Q`v8=d5*gKRjr`ZK3r4nm+KC@c+Aft14Lhz0#~3-us8}9=|EB
zmYfEhUUrTW6#1DP!8o_?*O&`6H$qjc1&bDHswZ?E`ey3dNd>Qu+C}@CJWBd-mi3gm
zK556KYbB&y`imz?pc)Cr^GVnP{m77j7-@=#_|&xYzl67j<YwoKK*`99$OH-sz=)!%
zqSCTV((1;zx-=NRu@U|<9@5s{uF>UH**A<Ba3vXjRn$Lb);c-)@Qo1!IXnCAy%zk#
zhh;62-nC)uy28x%B<Y?)#o;7!iJAm~L>{|9pueH7jk<^V6c1qF061;lPc}l~LyT6#
zm0vBI;UVFOYcFG|F@+DKjMCI6X@N)}9>sUbgg9&D?BU+x67-SUU{Q^yjPr5YZ?H;B
zDVA7m&;FzsQmlO0L)@n((+m_np;Cv71GCl2`@+w&Q=<u<h=A89AzF5w8apz{rA2BW
z4LGEuY@ovND>{H@E%Ny+xSxW>VhGq)bZLB?*T?;XYWhQXM(}U*nCw?$<3ks%SL_1b
zM?7l{c}^olXB0U#q{->D6X0RL6=cv$5-10V$`sc`NCcR4jsQ@uaJrNngFS~iA(<D)
z4$=HOmhCBnJ}YmYmv**(_j@g1EdF)Xm14n^IsY^FfyEV*=9RDQ-x(&dL!Y@XIv*T&
zSOd7ammSYxqV4kw<Xs99w-|;#yuUGG`5mTw!`+4@gTX@tUO|5)xu<N@I_s;AxlwPR
zZIn+|iax8i#93wm<DoeTYuM}z<*mo0GFs0JBh&AgT>&P?Xs<IbD&XT$i<-n|;=Ptj
zq0*+x;Yk#nD)PxsvX!mEJbKP8Xb{x8n^AU*AWo;B3*0s-3cp%7=^!52(^O{CHrWAu
z1MAF+Y6DSa8V@w&ioi_wscdZ@!-*-toGu$7$IoJ)BF<k1If7GG=~OhWvA5+Bs}b(x
zq0$rQ+AfzcSh&Uf@6-nX%z)DWw2{OTW&Xr4sP#W>q>s#M>5cGdz$H@~%aH6DV^TfF
zrNfN1P;uBT2V-O#T6wP3?)Ox@c8>KTXV@-!z&^6<ZFK9;gdm#j5$OFX)TTd$zdgb!
zSj0TkLON0u5)xzS9WP9BHQ5N6D(aW{NH<3qOr9?nffIx#m0-(-(ABkf^O7NrcfnO2
z6s`B686GX&_u((d29&fdMwJtvki2>f>yvmhtqEP2TU;82lB^NeH#WCwa9}d>gTtfa
zlhXsTAl&}h`M0AH9Q@+<g=@~i_v;H9YaF5Qr4ZGz<o<z3_$@hRl&i%9O(g&MtCC8L
zVt~ncU^wZSPDnia`%519cx~ycOatg-7>^|YhDlz_DmL5zUKdJwf4YaD+2bzYqNXu1
zN+`qRJ}RCiCyG|RR}hFXT3N(mW^2uCZ~7x!Yru`IU<M&aI-`(!r?#e-3V?%g$7t1R
zORU*V3<w6kCS+}MY+8*7jRDXs4Vz#HFxKebzGqB@x%EIVK*4dlP+bK&t(GH7(_Z+q
z*G|ny)ZD6&b}yV2CvL9?K*<Rs{)9uS#@m^I*-wd>mG0DQ=(_`FCN)AL^xpi4j!#>C
zoXZMkKZZS~g22XotAXLRLj(H3!T00{7l*={qQ}C1fkfYvHSQ!~BCk8cIYLn`=!f+~
z6|H4Pt*8B%2ucGMIud3VjHU=BJ<guufHc<QuqAoj9|tu6jBX{CBOK2=G}!{;`R&#m
z`FQWdMAMA47qT)3DLoD8X0*TuZpWBeCIxRvnxO76p_Bs8e{)-5X^cWPytQPqIc^Hp
zW#*^f+mL0a(-h>{5HN4;-}08t5Guhw%k$;P)}NT+xaz1EBcD<GLCP%Kjks@g)l<ZR
z!%7A!J)UOYYgWMpa_X?mQx=#=EqTJ3jk+_}vx_SGA@yC`Ih&f83;*v`BmQ4+Q2x5g
ze*ycSHz@xAoACGMhMy@(7!-nWl7LY}(_meU!a&0w)$M-X5w#2=7dejWALm@1N8ee7
z`S-FBhLeE67fowzx&fioLBUVJVWC$epOD7{ki<VxOY+ddI;Fcu#JlA<lVP>}3ZED0
zls-q4M_1a!W!2f(W7C@SGvlwenS#sV-TFpFCH=w>I069^EjJkvf|I{}OEx)EZapmk
zd$&rCSQKoC&tBpqTU#Rt=0(o$qDT)8$O`z$i@H9dzWgC;)xMziOj?86|M>;eZsg67
zrADxeNH)l&bwp8fD89^Kqh?oPP$+qu<r30P-EndW4fxxQ<h?kT6AUS_;owYave@qC
zhBA1#<YoW06m6t>As3Vbo}<}6uBpwOCvQ|lP%b+_X{VbLdG#Em+gjnkmqW2eQIch`
zS7y9M^m<dBfrmw$b9x@uP=nZJTT@0zx8l&xOvUABA+n{cZ;u-(O20%(_sSA^N5}7x
z*o{nfxL1K-a&b4+J74a11XH05raD^==Nt67|8(7HJzlE2M)S%MXnV12KErjP&fL1z
zHk{g}SJVByx$kwlXp(7w^w+gm-Djisf7UJ@w`s*4U%Bb!(m6KKtjMz3{PP<FWGw2%
zL%@FE%P6%_!h;7$0GCb21pKKqE5sDFC_TFb;2Et?L&C)j7FEB1P<YJMUT<PVne~Dp
z@Y6M#HIOwHMf9i3iN=L`Jg?ZWF9^9P!a$F>2*9HTJIz?pjL2JwkDwo(DFbN>mZ2)J
zN)8Z&++Gu-6sd@ZKhoQ`x~CPpgNLH^Dmk<bO%X+zj}FFOr69fj7C#wTo{cn4RAU*|
zroet9ot;Li9Q$-+b0=1?LdrJ3Us-vtAi#Nh!%lpFWiKa+<g+cvrwC)0>;VI;N>TSz
zxynz*W9&*2_kDT7xqJ>dD`OLUd8;@oj5w<!Vq#Gt4Y4eTSe&2DA+96QWuH25wv8{p
zUzNyPH0~zFUmI~h&aq+e{9u*4beh-8sd$RF%eFPqzSE{n#Ym+N0g!yy>bPwD=MBmT
N-)Z;VzeVxx{{o4HW_tht

literal 0
HcmV?d00001

diff --git a/public/js/vroom.js b/public/js/vroom.js
index e2bd0cb..4461585 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -21,6 +21,9 @@ var locale = {};
 // When pagination is done, how many item per page
 var itemPerPage = 20;
 
+// Will store the global webrtc object
+var webrtc = undefined;
+
 // Localize the strings we need
 $.ajax({
   url: rootUrl + 'localize/' + currentLang,
@@ -575,6 +578,30 @@ function initAdmin(){
   });
 }
 
+function initJoin(room){
+  $.ajax({
+    data: {
+      req: JSON.stringify({
+        action: 'get_rtc_conf',
+        param: {
+          room: room,
+        }
+      })
+    },
+    error: function(data){
+      showApiError(data);
+    },
+    success: function(data){
+      if (!video){
+        data.config.media.video = false;
+      }
+      data.config.localVideoEl = 'webRTCVideoLocal';
+      webrtc = new SimpleWebRTC(data.config);
+      initVroom(room);
+    }
+  });
+}
+
 // This is the main function called when you join a room
 function initVroom(room) {
 
@@ -876,7 +903,7 @@ function initVroom(room) {
         // color can be sent through the signaling channel
         peer.send('peer_color', {color: peers.local.color});
         // if we don't have a video, just signal it to this peer
-        peer.send('media_info', {video: !!videoConstraints});
+        peer.send('media_info', {video: !!video});
         // We don't have chat history yet ? Lets ask to this new peer
         if(!peers.local.hasHistory && chatIndex == 0){
           peer.sendDirectly('vroom', 'getHistory', '');
@@ -1515,11 +1542,14 @@ function initVroom(room) {
         if (data.msg){
           $.notify(data.msg, 'success');
         }
+        $('#videoLocalContainer').show(200);
+        $('#timeCounterXs,#timeCounter').tinyTimer({ from: new Date });
+        setTimeout(function(){
+          $('#connecting').modal('hide');
+        }, 200);
       }
     });
     checkMoh();
-    $('#videoLocalContainer').show(200);
-    $('#timeCounterXs,#timeCounter').tinyTimer({ from: new Date });
   });
 
   // Handle new video stream added: someone joined the room
@@ -1764,7 +1794,7 @@ function initVroom(room) {
   });
 
   // Disable suspend webcam button if no webcam
-  if (!videoConstraints){
+  if (!video){
     $('.btn-suspend-cam').addClass('disabled');
   }
 
diff --git a/templates/default/join.html.ep b/templates/default/join.html.ep
index ce2f63e..e758369 100644
--- a/templates/default/join.html.ep
+++ b/templates/default/join.html.ep
@@ -377,6 +377,24 @@
         </div>
       </div>
     </div>
+    <div class="modal fade" role="dialog" id="connecting" aria-labelledby="connecting" aria-hidden="false" data-keyboard="false" data-backdrop="static">
+      <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h4 class="modal-title">
+              <%=l 'CONNECTING' %>
+            </h4>
+          </div>
+          <div class="modal-body">
+            <img class="img-responsive center-block" src="<%= $self->get_url('/') %>img/connecting.gif" alt="<%=l 'CONNECTING' %>"/>
+            <br>
+            <p class="text-center">
+              <%=l 'CONNECTING_PLEASE_WAIT' %>
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
 %=include 'invite_modal'
 %=include 'configure_modal'
 %=include 'auth_modal'
@@ -432,7 +450,6 @@
     <script>
       var roomName = '<%= $room %>';
       $( document ).ready(function() {
-        setTimeout(function(){
           etherpad = {
             enabled: <%= $etherpad %>,
             <%
@@ -442,56 +459,10 @@
             path: "<%= $ethuri->path . '/p/' %>",
             group: "<%= $etherpadGroup %>"
           };
-          <% if ($video eq 'false'){ %>
-          videoConstraints = false;
-          <% } else{ %>
-          videoConstraints = {
-            mandatory: {
-              maxFrameRate: 15,
-            }
-          };
-          <% } %>
-          webrtc = new SimpleWebRTC({
-                   url: "<%= $config->{'signaling.uri'} %>",
-                   peerConnectionConfig: {
-                     iceServers: [
-                       {
-                         "url":"<%= $config->{'turn.stun_server'} %>"
-                       },
-                       <% if ($config->{'turn.turn_server'} && $config->{'turn.turn_server'} ne ''){ %>
-                       {
-                         "url":"<%= $config->{'turn.turn_server'} %>",
-                         <% if ($config->{'turn.turn_user'} && $config->{'turn.turn_user'} ne '' &&
-                                $config->{'turn.turn_password'} && $config->{'turn.turn_password'} ne '') { %>
-                         "username":"<%== $config->{'turn.turn_user'} %>",
-                         "credential":"<%== $config->{'turn.turn_password'} %>"
-                         <% } else { %>
-                         "username":"<%== $room %>",
-                         "credential":"<%== $turnPassword %>"
-                         <% } %>
-                       }
-                       <% } %>
-                     ]
-                   },
-                   localVideoEl: 'webRTCVideoLocal',
-                   autoRequestMedia: true,
-                   enableDataChannels: true,
-                   debug: false,
-                   detectSpeakingEvents: true,
-                   adjustPeerVolume: false,
-                   autoAdjustMic: false,
-                   harkOptions: {
-                     interval: 300,
-                     threshold: -20
-                   },
-                   media: {
-                     video: videoConstraints,
-                     audio: true
-                   }
-                 });
-          initVroom(roomName);
-        }, 300);
-      });
+          video = <%= ($video eq 'false') ? 'false' : 'true' %>;
+          initJoin(roomName);
+          $('#connecting').modal('show');
+        });
     </script>
   </div>
 %= include 'footer'
diff --git a/vroom.pl b/vroom.pl
index e94213f..b951c4a 100755
--- a/vroom.pl
+++ b/vroom.pl
@@ -36,6 +36,7 @@ $config->{'turn.turn_server'}                  ||= undef;
 $config->{'turn.turn_user'}                    ||= undef;
 $config->{'turn.turn_password'}                ||= undef;
 $config->{'turn.realm'}                        ||= 'vroom';
+$config->{'video.frame_rate'}                  ||= 15;
 $config->{'email.from '}                       ||= 'vroom@example.com';
 $config->{'email.contact'}                     ||= 'admin@example.com';
 $config->{'email.sendmail'}                    ||= '/sbin/sendmail';
@@ -1262,6 +1263,7 @@ any '/api' => sub {
       }
     );
   }
+  # And here anonymous method, which do not require an API Key
   elsif ($req->{action} eq 'create_room'){
     $req->{param}->{room} ||= $self->get_random_name();
     $req->{param}->{room} = lc $req->{param}->{room};
@@ -1601,6 +1603,53 @@ any '/api' => sub {
       status => 403
     );
   }
+  # Return configuration for SimpleWebRTC
+  elsif ($req->{action} eq 'get_rtc_conf'){
+    my $resp = {
+      url => $config->{'signaling.uri'},
+      peerConnectionConfig => {
+        iceServers => [{
+          url => $config->{'turn.stun_server'} 
+        }]
+      },
+      autoRequestMedia => Mojo::JSON::true,
+      enableDataChannels => Mojo::JSON::true,
+      debug => Mojo::JSON::false,
+      detectSpeakingEvents => Mojo::JSON::true,
+      adjustPeerVolume => Mojo::JSON::false,
+      autoAdjustMic => Mojo::JSON::false,
+      harkOptions => {
+        interval => 300,
+        threshold => -20
+      },
+      media => {
+        audio => Mojo::JSON::true,
+        video => {
+          mandatory => {
+            maxFrameRate => $config->{'video.frame_rate'}
+          }
+        }
+      }
+    };
+    # TODO: Support several TURN server in config
+    if ($config->{'turn.turn_server'}){
+      my $turn = { url => $config->{'turn.turn_server'} };
+      if ($config->{'turn.turn_user'} && $config->{'turn.turn_password'}){
+        $turn->{username}   = $config->{'turn.turn_user'};
+        $turn->{credential} = $config->{'turn.turn_password'};
+      }
+      else{
+        $turn->{username}   = $room->{name};
+        $turn->{credential} = $room->{token};
+      }
+      push @{$resp->{peerConnectionConfig}->{iceServers}}, $turn;
+    }
+    return $self->render(
+      json => {
+        config => $resp
+      }
+    );
+  }
   # Return just room config
   elsif ($req->{action} eq 'get_room_conf'){
     return $self->render(