Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
e97a1ff1
Commit
e97a1ff1
authored
Jun 23, 2014
by
Dele Olajide
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Jitsi Videobridge: Added bandwith control
parent
849bdd48
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
4 deletions
+37
-4
Config.class
...B-INF/classes/org/jitsi/videobridge/openfire/Config.class
+0
-0
HttpProxy.class
...NF/classes/org/jitsi/videobridge/openfire/HttpProxy.class
+0
-0
main.js
src/plugins/jitsivideobridge/src/apps/ofmeet/js/main.js
+9
-3
jitsivideobridge_i18n.properties
...itsivideobridge/src/i18n/jitsivideobridge_i18n.properties
+3
-1
Config.java
...ridge/src/java/org/jitsi/videobridge/openfire/Config.java
+4
-0
jitsi-videobridge.jsp
src/plugins/jitsivideobridge/src/web/jitsi-videobridge.jsp
+21
-0
No files found.
src/plugins/jitsivideobridge/src/WEB-INF/classes/org/jitsi/videobridge/openfire/Config.class
View file @
e97a1ff1
No preview for this file type
src/plugins/jitsivideobridge/src/WEB-INF/classes/org/jitsi/videobridge/openfire/HttpProxy.class
View file @
e97a1ff1
No preview for this file type
src/plugins/jitsivideobridge/src/apps/ofmeet/js/main.js
View file @
e97a1ff1
...
...
@@ -875,7 +875,7 @@ function handleAddSSRC(from, addsource)
$
(
document
).
trigger
(
'
remoteaudiostreamadded.rayo
'
,
[{
stream
:{
id
:
channelId
}},
window
.
RTC
.
rayo
.
nickname
]);
}
else
{
sdp
.
raw
=
s
dp
.
session
+
sdp
.
media
.
join
(
''
);
sdp
.
raw
=
s
etBandwidth
(
sdp
.
session
+
sdp
.
media
.
join
(
''
)
);
window
.
RTC
.
rayo
.
addssrc
=
true
;
window
.
RTC
.
rayo
.
pc
[
videobridge
].
setRemoteDescription
(
new
RTCSessionDescription
({
type
:
'
offer
'
,
sdp
:
sdp
.
raw
}
...
...
@@ -889,6 +889,12 @@ function handleAddSSRC(from, addsource)
}
};
function
setBandwidth
(
sdp
)
{
sdp
=
sdp
.
replace
(
/a=mid:audio
\r\n
/g
,
'
a=mid:audio
\r\n
b=AS:
'
+
config
.
audioBandwidth
+
'
\r\n
'
);
sdp
=
sdp
.
replace
(
/a=mid:video
\r\n
/g
,
'
a=mid:video
\r\n
b=AS:
'
+
config
.
videoBandwidth
+
'
\r\n
'
);
return
sdp
;
}
function
handleOffer
(
from
,
offer
)
{
...
...
@@ -908,8 +914,8 @@ function handleOffer (from, offer)
}
var
SDPHeader
=
"
v=0
\r\n
o=- 5151055458874951233 2 IN IP4 127.0.0.1
\r\n
s=-
\r\n
t=0 0
\r\n
"
;
var
SDPVideo
=
"
m=video 1 RTP/SAVPF 100 116 117
\r\n
c=IN IP4 0.0.0.0
\r\n
a=rtcp:1 IN IP4 0.0.0.0
\r\n
a=mid:video
\r\n
a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
\r\n
a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
\r\n
a=
"
+
videoDirection
+
"
\r\n
a=rtpmap:100 VP8/90000
\r\n
a=rtcp-fb:100 ccm fir
\r\n
a=rtcp-fb:100 nack
\r\n
a=rtcp-fb:100 goog-remb
\r\n
"
;
var
SDPAudio
=
"
m=audio 1 RTP/SAVPF 111 0 126
\r\n
c=IN IP4 0.0.0.0
\r\n
a=rtcp:1 IN IP4 0.0.0.0
\r\n
a=mid:audio
\r\n
a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
\r\n
a=
"
+
audioDirection
+
"
\r\n
a=rtpmap:111 opus/48000/2
\r\n
a=fmtp:111 minptime=10
\r\n
a=rtpmap:0 PCMU/8000
\r\n
a=rtpmap:126 telephone-event/8000
\r\n
a=maxptime:60
\r\n
"
;
var
SDPVideo
=
"
m=video 1 RTP/SAVPF 100 116 117
\r\n
c=IN IP4 0.0.0.0
\r\n
a=rtcp:1 IN IP4 0.0.0.0
\r\n
a=mid:video
\r\n
b=AS:
"
+
config
.
videoBandwidth
+
"
\r\n
a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
\r\n
a=extmap:3 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
\r\n
a=
"
+
videoDirection
+
"
\r\n
a=rtpmap:100 VP8/90000
\r\n
a=rtcp-fb:100 ccm fir
\r\n
a=rtcp-fb:100 nack
\r\n
a=rtcp-fb:100 goog-remb
\r\n
"
;
var
SDPAudio
=
"
m=audio 1 RTP/SAVPF 111 0 126
\r\n
c=IN IP4 0.0.0.0
\r\n
a=rtcp:1 IN IP4 0.0.0.0
\r\n
a=mid:audio
\r\n
b=AS:
"
+
config
.
audioBandwidth
+
"
\r\n
a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
\r\n
a=
"
+
audioDirection
+
"
\r\n
a=rtpmap:111 opus/48000/2
\r\n
a=fmtp:111 minptime=10
\r\n
a=rtpmap:0 PCMU/8000
\r\n
a=rtpmap:126 telephone-event/8000
\r\n
a=maxptime:60
\r\n
"
;
if
(
!
config
.
recordVideo
)
...
...
src/plugins/jitsivideobridge/src/i18n/jitsivideobridge_i18n.properties
View file @
e97a1ff1
...
...
@@ -39,4 +39,6 @@ config.page.configuration.ofmeet.usenicks.enabled_desc=Prompt user to enter a ni
config.page.configuration.ofmeet.usenicks.disabled
=
Disable Nicknames
config.page.configuration.ofmeet.usenicks.disabled_desc
=
Do not prompt user to provide a nickname
config.page.configuration.ofmeet.iceservers
=
ICE Servers (JSON object of STUN and TURN servers)
config.page.configuration.ofmeet.resolution
=
Video Resolution
\ No newline at end of file
config.page.configuration.ofmeet.resolution
=
Video Resolution
config.page.configuration.ofmeet.audio.bandwidth
=
Audio Bandwidth
config.page.configuration.ofmeet.video.bandwidth
=
Video Bandwidth
\ No newline at end of file
src/plugins/jitsivideobridge/src/java/org/jitsi/videobridge/openfire/Config.java
View file @
e97a1ff1
...
...
@@ -46,6 +46,8 @@ public class Config extends HttpServlet
String
iceServers
=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.ofmeet.iceservers"
,
""
);
String
resolution
=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.ofmeet.resolution"
,
"720"
);
String
audioBandwidth
=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.ofmeet.audio.bandwidth"
,
"64"
);
String
videoBandwidth
=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.ofmeet.video.bandwidth"
,
"512"
);
String
useNicks
=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.ofmeet.usenicks"
,
"false"
);
String
useIPv6
=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.ofmeet.useipv6"
,
"false"
);
String
recordVideo
=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.media.record"
,
"true"
);
...
...
@@ -63,6 +65,8 @@ public class Config extends HttpServlet
out
.
println
(
" useWebsockets: "
+
(
websockets
?
"true"
:
"false"
)
+
","
);
out
.
println
(
" useNodeJs: "
+
(
nodejs
?
"true"
:
"false"
)
+
","
);
out
.
println
(
" resolution: '"
+
resolution
+
"',"
);
out
.
println
(
" audioBandwidth: '"
+
audioBandwidth
+
"',"
);
out
.
println
(
" videoBandwidth: '"
+
videoBandwidth
+
"',"
);
out
.
println
(
" bosh: window.location.protocol + '//' + window.location.host + '/http-bind/'"
);
out
.
println
(
"}; "
);
...
...
src/plugins/jitsivideobridge/src/web/jitsi-videobridge.jsp
View file @
e97a1ff1
...
...
@@ -104,7 +104,12 @@
String
resolution
=
request
.
getParameter
(
"resolution"
);
JiveGlobals
.
setProperty
(
"org.jitsi.videobridge.ofmeet.resolution"
,
resolution
);
String
audiobandwidth
=
request
.
getParameter
(
"audiobandwidth"
);
JiveGlobals
.
setProperty
(
"org.jitsi.videobridge.ofmeet.audio.bandwidth"
,
audiobandwidth
);
String
videobandwidth
=
request
.
getParameter
(
"videobandwidth"
);
JiveGlobals
.
setProperty
(
"org.jitsi.videobridge.ofmeet.video.bandwidth"
,
videobandwidth
);
}
%>
...
...
@@ -171,6 +176,22 @@
<td><input
type=
"text"
size=
"10"
maxlength=
"100"
name=
"resolution"
value=
"
<%=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.ofmeet.resolution"
,
"720"
)
%>
"
>
</td>
</tr>
<tr>
<td
align=
"left"
width=
"150"
>
<fmt:message
key=
"config.page.configuration.ofmeet.audio.bandwidth"
/>
</td>
<td><input
type=
"text"
size=
"10"
maxlength=
"100"
name=
"audiobandwidth"
value=
"
<%=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.ofmeet.audio.bandwidth"
,
"64"
)
%>
"
>
</td>
</tr>
<tr>
<td
align=
"left"
width=
"150"
>
<fmt:message
key=
"config.page.configuration.ofmeet.video.bandwidth"
/>
</td>
<td><input
type=
"text"
size=
"10"
maxlength=
"100"
name=
"videobandwidth"
value=
"
<%=
JiveGlobals
.
getProperty
(
"org.jitsi.videobridge.ofmeet.video.bandwidth"
,
"512"
)
%>
"
>
</td>
</tr>
</tbody>
</table>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment