Skip to content

F
freeswitch
提交 396bc993 authored 作者: Brian West's avatar Brian West
浏览文件
操作

Sync verto code

上级 bd10f089
显示空白字符变更
内嵌 并排
正在显示 包含 207 行增加 和 40 行删除
html5/verto/demo/js/verto-min.js
浏览文件 @ 396bc993
This diff was suppressed by a .gitattributes entry.
html5/verto/demo/verto.js
浏览文件 @ 396bc993
...@@ -469,7 +469,8 @@ function init() { ...@@ -469,7 +469,8 @@ function init() {
ringFile: "sounds/bell_ring2.wav", ringFile: "sounds/bell_ring2.wav",
videoParams: { videoParams: {
"minWidth": "1280", "minWidth": "1280",
"minHeight": "720" "minHeight": "720",
"minFrameRate": 30
}, },
audioParams: { audioParams: {
googAutoGainControl: false, googAutoGainControl: false,
......
html5/verto/js/Makefile
浏览文件 @ 396bc993
...@@ -19,3 +19,9 @@ install-demo: all ...@@ -19,3 +19,9 @@ install-demo: all
install-maxdemo: all verto-max.js install-maxdemo: all verto-max.js
cp verto-max.js ../demo/js/verto-min.js cp verto-max.js ../demo/js/verto-min.js
install-video_demo: all
cp verto-min.js ../video_demo/js
install-video_maxdemo: all verto-max.js
cp verto-max.js ../video_demo/js/verto-min.js
html5/verto/js/src/jquery.verto.js
浏览文件 @ 396bc993
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
*/ */
(function($) { (function($) {
var sources = [];
var generateGUID = (typeof(window.crypto) !== 'undefined' && typeof(window.crypto.getRandomValues) !== 'undefined') ? var generateGUID = (typeof(window.crypto) !== 'undefined' && typeof(window.crypto.getRandomValues) !== 'undefined') ?
function() { function() {
...@@ -71,6 +72,7 @@ ...@@ -71,6 +72,7 @@
passwd: null, passwd: null,
socketUrl: null, socketUrl: null,
tag: null, tag: null,
localTag: null,
videoParams: {}, videoParams: {},
audioParams: {}, audioParams: {},
loginParams: {}, loginParams: {},
...@@ -437,6 +439,12 @@ ...@@ -437,6 +439,12 @@
if (data.params.callID) { if (data.params.callID) {
var dialog = verto.dialogs[data.params.callID]; var dialog = verto.dialogs[data.params.callID];
if (data.method === "verto.attach" && dialog) {
delete dialog.verto.dialogs[dialog.callID];
dialog.rtc.stop();
dialog = null;
}
if (dialog) { if (dialog) {
switch (data.method) { switch (data.method) {
...@@ -1171,21 +1179,51 @@ ...@@ -1171,21 +1179,51 @@
var play_id = "play_" + confMan.serno; var play_id = "play_" + confMan.serno;
var stop_id = "stop_" + confMan.serno; var stop_id = "stop_" + confMan.serno;
var recording_id = "recording_" + confMan.serno; var recording_id = "recording_" + confMan.serno;
var snapshot_id = "snapshot_" + confMan.serno;
var rec_stop_id = "recording_stop" + confMan.serno; var rec_stop_id = "recording_stop" + confMan.serno;
var div_id = "confman_" + confMan.serno; var div_id = "confman_" + confMan.serno;
var html = "<div id='" + div_id + "'><br>" + var html = "<div id='" + div_id + "'><br>" +
"<button class='ctlbtn' id='" + play_id + "'>Play</button>" + "<button class='ctlbtn' id='" + play_id + "'>Play</button>" +
"<button class='ctlbtn' id='" + stop_id + "'>Stop</button>" + "<button class='ctlbtn' id='" + stop_id + "'>Stop</button>" +
"<button class='ctlbtn' id='" + recording_id + "'>Record</button>" + "<button class='ctlbtn' id='" + recording_id + "'>Record</button>" +
"<button class='ctlbtn' id='" + rec_stop_id + "'>Record Stop</button>" + "<button class='ctlbtn' id='" + rec_stop_id + "'>Record Stop</button>" +
(confMan.params.hasVid ? "<button class='ctlbtn' id='" + snapshot_id + "'>PNG Snapshot</button>" : "") +
"<br><br></div>"; "<br><br></div>";
jq.html(html); jq.html(html);
if (confMan.params.hasVid) {
var vlayout_id = "confman_vid_layout_" + confMan.serno;
var vlselect_id = "confman_vl_select_" + confMan.serno;
var vlhtml = "<div id='" + vlayout_id + "'><br>" +
"<b>Video Layout</b> <select id='" + vlselect_id + "'></select> " +
"<br><br></div>";
jq.append(vlhtml);
$("#" + vlselect_id).change(function() {
var val = $("#" + vlselect_id).find(":selected").val();
if (val !== "none") {
confMan.modCommand("vid-layout", null, val);
}
});
$("#" + snapshot_id).click(function() {
var file = prompt("Please enter file name", "");
if (file) {
confMan.modCommand("vid-write-png", null, file);
}
});
}
$("#" + play_id).click(function() { $("#" + play_id).click(function() {
var file = prompt("Please enter file name", ""); var file = prompt("Please enter file name", "");
if (file) {
confMan.modCommand("play", null, file); confMan.modCommand("play", null, file);
}
}); });
$("#" + stop_id).click(function() { $("#" + stop_id).click(function() {
...@@ -1194,7 +1232,9 @@ ...@@ -1194,7 +1232,9 @@
$("#" + recording_id).click(function() { $("#" + recording_id).click(function() {
var file = prompt("Please enter file name", ""); var file = prompt("Please enter file name", "");
if (file) {
confMan.modCommand("recording", null, ["start", file]); confMan.modCommand("recording", null, ["start", file]);
}
}); });
$("#" + rec_stop_id).click(function() { $("#" + rec_stop_id).click(function() {
...@@ -1207,6 +1247,10 @@ ...@@ -1207,6 +1247,10 @@
var x = parseInt(rowid); var x = parseInt(rowid);
var kick_id = "kick_" + x; var kick_id = "kick_" + x;
var tmute_id = "tmute_" + x; var tmute_id = "tmute_" + x;
var tvmute_id = "tvmute_" + x;
var vbanner_id = "vbanner_" + x;
var tvpresenter_id = "tvpresenter_" + x;
var tvfloor_id = "tvfloor_" + x;
var box_id = "box_" + x; var box_id = "box_" + x;
var volup_id = "volume_in_up" + x; var volup_id = "volume_in_up" + x;
var voldn_id = "volume_in_dn" + x; var voldn_id = "volume_in_dn" + x;
...@@ -1216,6 +1260,10 @@ ...@@ -1216,6 +1260,10 @@
var html = "<div id='" + box_id + "'>" + var html = "<div id='" + box_id + "'>" +
"<button class='ctlbtn' id='" + kick_id + "'>Kick</button>" + "<button class='ctlbtn' id='" + kick_id + "'>Kick</button>" +
"<button class='ctlbtn' id='" + tmute_id + "'>Mute</button>" + "<button class='ctlbtn' id='" + tmute_id + "'>Mute</button>" +
(confMan.params.hasVid ? "<button class='ctlbtn' id='" + tvmute_id + "'>VMute</button>" : "") +
(confMan.params.hasVid ? "<button class='ctlbtn' id='" + tvpresenter_id + "'>Presenter</button>" : "") +
(confMan.params.hasVid ? "<button class='ctlbtn' id='" + tvfloor_id + "'>Vid Floor</button>" : "") +
(confMan.params.hasVid ? "<button class='ctlbtn' id='" + vbanner_id + "'>Banner</button>" : "") +
"<button class='ctlbtn' id='" + voldn_id + "'>Vol -</button>" + "<button class='ctlbtn' id='" + voldn_id + "'>Vol -</button>" +
"<button class='ctlbtn' id='" + volup_id + "'>Vol +</button>" + "<button class='ctlbtn' id='" + volup_id + "'>Vol +</button>" +
"<button class='ctlbtn' id='" + transfer_id + "'>Transfer</button>" + "<button class='ctlbtn' id='" + transfer_id + "'>Transfer</button>" +
...@@ -1240,7 +1288,9 @@ ...@@ -1240,7 +1288,9 @@
$("#" + transfer_id).click(function() { $("#" + transfer_id).click(function() {
var xten = prompt("Enter Extension"); var xten = prompt("Enter Extension");
if (xten) {
confMan.modCommand("transfer", x, xten); confMan.modCommand("transfer", x, xten);
}
}); });
$("#" + kick_id).click(function() { $("#" + kick_id).click(function() {
...@@ -1251,6 +1301,24 @@ ...@@ -1251,6 +1301,24 @@
confMan.modCommand("tmute", x); confMan.modCommand("tmute", x);
}); });
if (confMan.params.hasVid) {
$("#" + tvmute_id).click(function() {
confMan.modCommand("tvmute", x);
});
$("#" + tvpresenter_id).click(function() {
confMan.modCommand("vid-res-id", x, "presenter");
});
$("#" + tvfloor_id).click(function() {
confMan.modCommand("vid-floor", x, "force");
});
$("#" + vbanner_id).click(function() {
var text = prompt("Please enter text", "");
if (text) {
confMan.modCommand("vid-banner", x, escape(text));
}
});
}
$("#" + volup_id).click(function() { $("#" + volup_id).click(function() {
confMan.modCommand("volume_in", x, "up"); confMan.modCommand("volume_in", x, "up");
}); });
...@@ -1269,7 +1337,7 @@ ...@@ -1269,7 +1337,7 @@
if (confMan.params.laData.role === "moderator") { if (confMan.params.laData.role === "moderator") {
atitle = "Action"; atitle = "Action";
awidth = 200; awidth = 300;
if (confMan.params.mainModID) { if (confMan.params.mainModID) {
genMainMod($(confMan.params.mainModID)); genMainMod($(confMan.params.mainModID));
...@@ -1284,6 +1352,31 @@ ...@@ -1284,6 +1352,31 @@
if (confMan.params.onBroadcast) { if (confMan.params.onBroadcast) {
confMan.params.onBroadcast(verto, confMan, e.data); confMan.params.onBroadcast(verto, confMan, e.data);
} }
if (e.data["conf-command"] === "list-videoLayouts") {
var vlselect_id = "#confman_vl_select_" + confMan.serno;
var vlayout_id = "#confman_vid_layout_" + confMan.serno;
var x = 0;
var options;
$(vlselect_id).append(new Option("Choose a Layout", "none"));
if (e.data.responseData) {
options = e.data.responseData.sort();
for (var i in options) {
$(vlselect_id).append(new Option(options[i], options[i]));
x++;
}
}
if (x) {
$(vlselect_id).selectmenu('refresh', true);
} else {
$(vlayout_id).hide();
}
} else {
if (!confMan.destroyed && confMan.params.displayID) { if (!confMan.destroyed && confMan.params.displayID) {
$(confMan.params.displayID).html(e.data.response + "<br><br>"); $(confMan.params.displayID).html(e.data.response + "<br><br>");
if (confMan.lastTimeout) { if (confMan.lastTimeout) {
...@@ -1293,7 +1386,13 @@ ...@@ -1293,7 +1386,13 @@
confMan.lastTimeout = setTimeout(function() { $(confMan.params.displayID).html(confMan.destroyed ? "" : "Moderator Controls Ready<br><br>");}, 4000); confMan.lastTimeout = setTimeout(function() { $(confMan.params.displayID).html(confMan.destroyed ? "" : "Moderator Controls Ready<br><br>");}, 4000);
} }
} }
}
}); });
if (confMan.params.hasVid) {
confMan.modCommand("list-videoLayouts", null, null);
}
} }
var row_callback = null; var row_callback = null;
...@@ -1339,7 +1438,7 @@ ...@@ -1339,7 +1438,7 @@
}, },
{ {
"sTitle": "Status", "sTitle": "Status",
"sWidth": confMan.params.hasVid ? "300px" : "150px" "sWidth": confMan.params.hasVid ? "200px" : "150px"
}, },
{ {
"sTitle": atitle, "sTitle": atitle,
...@@ -1367,7 +1466,7 @@ ...@@ -1367,7 +1466,7 @@
$.verto.confMan.prototype.modCommand = function(cmd, id, value) { $.verto.confMan.prototype.modCommand = function(cmd, id, value) {
var confMan = this; var confMan = this;
confMan.verto.sendMethod("verto.broadcast", { confMan.verto.rpcClient.call("verto.broadcast", {
"eventChannel": confMan.params.laData.modChannel, "eventChannel": confMan.params.laData.modChannel,
"data": { "data": {
"application": "conf-control", "application": "conf-control",
...@@ -1378,6 +1477,8 @@ ...@@ -1378,6 +1477,8 @@
}); });
}; };
$.verto.confMan.prototype.destroy = function() { $.verto.confMan.prototype.destroy = function() {
var confMan = this; var confMan = this;
...@@ -1402,8 +1503,13 @@ ...@@ -1402,8 +1503,13 @@
dialog.params = $.extend({ dialog.params = $.extend({
useVideo: verto.options.useVideo, useVideo: verto.options.useVideo,
useStereo: verto.options.useStereo, useStereo: verto.options.useStereo,
screenShare: false,
useCamera: "any",
useMic: "any",
tag: verto.options.tag, tag: verto.options.tag,
login: verto.options.login localTag: verto.options.localTag,
login: verto.options.login,
videoParams: verto.options.videoParams
}, params); }, params);
dialog.verto = verto; dialog.verto = verto;
...@@ -1413,6 +1519,9 @@ ...@@ -1413,6 +1519,9 @@
dialog.callbacks = verto.callbacks; dialog.callbacks = verto.callbacks;
dialog.answered = false; dialog.answered = false;
dialog.attach = params.attach || false; dialog.attach = params.attach || false;
dialog.screenShare = params.screenShare || false;
dialog.useCamera = params.useCamera;
dialog.useMic = params.useMic;
if (dialog.params.callID) { if (dialog.params.callID) {
dialog.callID = dialog.params.callID; dialog.callID = dialog.params.callID;
...@@ -1428,6 +1537,10 @@ ...@@ -1428,6 +1537,10 @@
} }
} //else conjure one TBD } //else conjure one TBD
if (dialog.params.localTag) {
dialog.localVideo = document.getElementById(dialog.params.localTag);
}
dialog.verto.dialogs[dialog.callID] = dialog; dialog.verto.dialogs[dialog.callID] = dialog;
var RTCcallbacks = {}; var RTCcallbacks = {};
...@@ -1488,6 +1601,10 @@ ...@@ -1488,6 +1601,10 @@
} }
}; };
RTCcallbacks.onStream = function(rtc, stream) {
console.log("stream started");
};
RTCcallbacks.onError = function(e) { RTCcallbacks.onError = function(e) {
console.error("ERROR:", e); console.error("ERROR:", e);
dialog.hangup({cause: "Device or Permission Error"}); dialog.hangup({cause: "Device or Permission Error"});
...@@ -1495,12 +1612,16 @@ ...@@ -1495,12 +1612,16 @@
dialog.rtc = new $.FSRTC({ dialog.rtc = new $.FSRTC({
callbacks: RTCcallbacks, callbacks: RTCcallbacks,
localVideo: dialog.localVideo,
useVideo: dialog.videoStream, useVideo: dialog.videoStream,
useAudio: dialog.audioStream, useAudio: dialog.audioStream,
useStereo: dialog.params.useStereo, useStereo: dialog.params.useStereo,
videoParams: verto.options.videoParams, videoParams: dialog.params.videoParams,
audioParams: verto.options.audioParams, audioParams: verto.options.audioParams,
iceServers: verto.options.iceServers iceServers: verto.options.iceServers,
screenShare: dialog.screenShare,
useCamera: dialog.useCamera,
useMic: dialog.useMic
}); });
dialog.rtc.verto = dialog.verto; dialog.rtc.verto = dialog.verto;
...@@ -1604,7 +1725,9 @@ ...@@ -1604,7 +1725,9 @@
break; break;
case $.verto.enum.state.destroy: case $.verto.enum.state.destroy:
delete dialog.verto.dialogs[dialog.callID]; delete dialog.verto.dialogs[dialog.callID];
if (!dialog.params.screenShare) {
dialog.rtc.stop(); dialog.rtc.stop();
}
break; break;
} }
...@@ -1722,7 +1845,7 @@ ...@@ -1722,7 +1845,7 @@
dialog.videoStream = null; dialog.videoStream = null;
} }
dialog.rtc.useVideo(dialog.videoStream); dialog.rtc.useVideo(dialog.videoStream, dialog.localVideo);
}; };
...@@ -1821,6 +1944,12 @@ ...@@ -1821,6 +1944,12 @@
var dialog = this; var dialog = this;
if (!dialog.answered) { if (!dialog.answered) {
if (!params) {
params = {};
}
params.sdp = dialog.params.sdp;
if (params) { if (params) {
if (params.useVideo) { if (params.useVideo) {
dialog.useVideo(true); dialog.useVideo(true);
...@@ -1828,7 +1957,8 @@ ...@@ -1828,7 +1957,8 @@
dialog.params.callee_id_name = params.callee_id_name; dialog.params.callee_id_name = params.callee_id_name;
dialog.params.callee_id_number = params.callee_id_number; dialog.params.callee_id_number = params.callee_id_number;
} }
dialog.rtc.createAnswer(dialog.params.sdp);
dialog.rtc.createAnswer(params);
dialog.answered = true; dialog.answered = true;
} }
}; };
...@@ -1846,9 +1976,9 @@ ...@@ -1846,9 +1976,9 @@
dialog.setState($.verto.enum.state.active); dialog.setState($.verto.enum.state.active);
} else { } else {
if (dialog.gotEarly) { if (dialog.gotEarly) {
console.log("Dialog " + dialog.callID + "Got answer while still establishing early media, delaying..."); console.log("Dialog " + dialog.callID + " Got answer while still establishing early media, delaying...");
} else { } else {
console.log("Dialog " + dialog.callID + "Answering Channel"); console.log("Dialog " + dialog.callID + " Answering Channel");
dialog.rtc.answer(params.sdp, function() { dialog.rtc.answer(params.sdp, function() {
dialog.setState($.verto.enum.state.active); dialog.setState($.verto.enum.state.active);
}, function(e) { }, function(e) {
...@@ -1858,6 +1988,8 @@ ...@@ -1858,6 +1988,8 @@
console.log("Dialog " + dialog.callID + "ANSWER SDP", params.sdp); console.log("Dialog " + dialog.callID + "ANSWER SDP", params.sdp);
} }
} }
}; };
$.verto.dialog.prototype.cidString = function(enc) { $.verto.dialog.prototype.cidString = function(enc) {
...@@ -1996,11 +2128,39 @@ ...@@ -1996,11 +2128,39 @@
for (var i in $.verto.saved) { for (var i in $.verto.saved) {
var verto = $.verto.saved[i]; var verto = $.verto.saved[i];
if (verto) { if (verto) {
verto.logout();
verto.purge(); verto.purge();
verto.logout();
} }
} }
return $.verto.warnOnUnload; return $.verto.warnOnUnload;
}); });
$.verto.videoDevices = [];
$.verto.audioDevices = [];
$.verto.findDevices = function(runtime) {
var aud = [], vid = [];
MediaStreamTrack.getSources(function (media_sources) {
for (var i = 0; i < media_sources.length; i++) {
if (media_sources[i].kind == 'video') {
vid.push(media_sources[i]);
} else {
aud.push(media_sources[i]);
}
}
$.verto.videoDevices = vid;
$.verto.audioDevices = aud;
console.info("Audio Devices", $.verto.audioDevices);
console.info("Video Devices", $.verto.videoDevices);
runtime();
});
}
})(jQuery); })(jQuery);
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论