Commit 8f7385bf authored by Dele Olajide's avatar Dele Olajide Committed by dele

Jitsi Videobridge - latest jar files, added screenshare to ofmeet, add...

Jitsi Videobridge - latest jar files, added screenshare to ofmeet, add fullscreen mode by double click to ofmeet

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13864 b35dd754-fafc-0310-a699-88a17e54d16e
parent c9012a27
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div id="videospace"> <div id="videospace">
<div class="fade_line"></div> <div class="fade_line"></div>
<video id="largeVideo" autoplay oncontextmenu="return false;"></video> <video id="largeVideo" onDblClick="toggleFullScreen();" autoplay oncontextmenu="return false;"></video>
<div class="fade_line"></div> <div class="fade_line"></div>
<div id="remoteVideos"> <div id="remoteVideos">
<video id="localVideo" autoplay oncontextmenu="return false;" muted/> <video id="localVideo" autoplay oncontextmenu="return false;" muted/>
......
...@@ -78,7 +78,12 @@ $(document).ready(function () ...@@ -78,7 +78,12 @@ $(document).ready(function ()
console.log('connected'); console.log('connected');
connection.send($pres()); connection.send($pres());
registerRayoEvents(); registerRayoEvents();
getConstraints(['audio', 'video'], '720');
if (urlParam("screen"))
getConstraints(['screen']);
else
getConstraints(['audio', 'video'], '720');
getUserMedia(); getUserMedia();
} else { } else {
...@@ -711,10 +716,11 @@ function sendAnswer(from, videobridge, confid, channelId) ...@@ -711,10 +716,11 @@ function sendAnswer(from, videobridge, confid, channelId)
for (channel = 0; channel < 2; channel++) for (channel = 0; channel < 2; channel++)
{ {
if (channelId[channel]) if (remoteSDP.media[channel])
{ {
change.c('content', {name: channel === 0 ? 'audio' : 'video'}); var indx =
change.c('channel', {id: channelId[channel]}); change.c('content', {name: remoteSDP.media[channel].indexOf('m=audio') > -1 ? 'audio' : 'video'});
change.c('channel', {id: remoteSDP.media[channel].indexOf('m=audio') > -1 ? channelId[0] : channelId[1]});
tmp = SDPUtil.find_lines(remoteSDP.media[channel], 'a=ssrc:'); tmp = SDPUtil.find_lines(remoteSDP.media[channel], 'a=ssrc:');
change.c('source', { xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' }); change.c('source', { xmlns: 'urn:xmpp:jingle:apps:rtp:ssma:0' });
...@@ -935,6 +941,29 @@ function updateRoomUrl(newRoomUrl) { ...@@ -935,6 +941,29 @@ function updateRoomUrl(newRoomUrl) {
roomUrl = newRoomUrl; roomUrl = newRoomUrl;
} }
function toggleFullScreen()
{
var videoElement = document.getElementById("largeVideo");
if (!document.mozFullScreen && !document.webkitFullScreen)
{
if (videoElement.mozRequestFullScreen) {
videoElement.mozRequestFullScreen();
} else {
videoElement.webkitRequestFullScreen(Element.ALLOW_KEYBOARD_INPUT);
}
} else {
if (document.mozCancelFullScreen) {
document.mozCancelFullScreen();
} else {
document.webkitCancelFullScreen();
}
}
}
function setEmoticons(body) function setEmoticons(body)
{ {
if (body) if (body)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment