bug fixes for mobile devices

This commit is contained in:
Steve Seguin 2022-07-03 05:40:33 -04:00 committed by GitHub
parent 2fde8ebe27
commit b6e1a4804c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 27 deletions

View File

@ -82,7 +82,7 @@
<link itemprop="url" href="./media/vdoNinja_logo_full.png" /> <link itemprop="url" href="./media/vdoNinja_logo_full.png" />
</span> </span>
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=37"></script> <script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=37"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=472"></script> <script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=473"></script>
<input id="zoomSlider" type="range" style="display: none;" /> <input id="zoomSlider" type="range" style="display: none;" />
<span id="electronDragZone" style="pointer-events: none; z-index:-10; position:absolute;top:0;left:0;width:100%;height:2%;-webkit-app-region: drag;min-height:20px;"></span> <span id="electronDragZone" style="pointer-events: none; z-index:-10; position:absolute;top:0;left:0;width:100%;height:2%;-webkit-app-region: drag;min-height:20px;"></span>
<div id="header"> <div id="header">
@ -2155,11 +2155,11 @@
// session.defaultBackgroundImages = ["./media/bg_sample1.webp", "./media/bg_sample2.webp"]; // for &effects=5 (virtual backgrounds) // session.defaultBackgroundImages = ["./media/bg_sample1.webp", "./media/bg_sample2.webp"]; // for &effects=5 (virtual backgrounds)
</script> </script>
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/aes.js"></script> <script type="text/javascript" crossorigin="anonymous" src="./thirdparty/aes.js"></script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=361"></script> <script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=362"></script>
<!-- <!--
// If you wish to change branding, blank offers a good clean start. // If you wish to change branding, blank offers a good clean start.
<script type="text/javascript" id="main-js" src="./main.js" data-translation="blank"></script> <script type="text/javascript" id="main-js" src="./main.js" data-translation="blank"></script>
--> -->
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=375"></script> <script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=376"></script>
</body> </body>
</html> </html>

27
lib.js
View File

@ -14718,7 +14718,11 @@ var beforeScreenShare = null; // video
var screenShareAudioTrack = null; var screenShareAudioTrack = null;
async function toggleScreenShare(reload = false) { //////////////////////////// async function toggleScreenShare(reload = false) { ////////////////////////////
var quality = session.quality_ss || 0; var quality = session.quality_ss;
if (quality === false){
quality = session.quality_wb;
}
if (session.quality !== false){ if (session.quality !== false){
quality = session.quality; quality = session.quality;
@ -15729,6 +15733,13 @@ async function grabVideo(quality = 0, eleName = 'previewWebcam', selector = "sel
return; return;
} }
if (session.chunked){
for (UUID in session.pcs) {
session.chunkedStream(UUID); // make sure we check that this connection allows video / audio
}
return;
}
if (session.mc && session.mc.getSenders){ if (session.mc && session.mc.getSenders){
session.mc.getSenders().forEach((sender) => { // I suppose there could be a race condition between negotiating and updating this. if joining at the same time as changnig streams? session.mc.getSenders().forEach((sender) => { // I suppose there could be a race condition between negotiating and updating this. if joining at the same time as changnig streams?
@ -16257,6 +16268,14 @@ function updateRenderOutpipe(){ // video only.
} }
function pushOutVideoTrack(track){ function pushOutVideoTrack(track){
if (session.chunked){
for (UUID in session.pcs) {
session.chunkedStream(UUID); // make sure we check that this connection allows video / audio
}
return;
}
if (session.mc && session.mc.getSenders){ // should only be 0 or 1 video sender, ever. if (session.mc && session.mc.getSenders){ // should only be 0 or 1 video sender, ever.
//var added = false; //var added = false;
session.mc.getSenders().forEach((sender) => { // I suppose there could be a race condition between negotiating and updating this. if joining at the same time as changnig streams? session.mc.getSenders().forEach((sender) => { // I suppose there could be a race condition between negotiating and updating this. if joining at the same time as changnig streams?
@ -26145,7 +26164,11 @@ async function createSecondStream() { ////////////////////////////
var video = {} var video = {}
var quality = session.quality_ss || 0; var quality = session.quality_ss;
if (quality === false){
quality = session.quality_wb;
}
if (session.quality !== false){ if (session.quality !== false){
quality = session.quality; quality = session.quality;

45
main.js
View File

@ -4128,31 +4128,34 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
if (e.data.scale === false){ if (e.data.scale === false){
session.dynamicScale = true; // disable manual scaling session.dynamicScale = true; // disable manual scaling
updateMixer(); updateMixer();
var scale = false;
} else { } else {
session.dynamicScale = false; session.dynamicScale = false;
var scale = parseInt(e.data.scale) || 100; var scale = parseInt(e.data.scale) || 100;
if (e.data.UUID){
session.sendRequest({scale:scale}, UUID);
} else if (e.data.target){
for (var i in session.rpcs) {
try {
if ("streamID" in session.rpcs[i]) {
if ("target" in e.data) {
if ((session.rpcs[i].streamID == e.data.target) || (e.data.target == "*")) { // specify a stream ID or let it apply to all videos
session.sendRequest({scale:scale}, i);
}
} else {
session.sendRequest({scale:scale}, i);
}
}
} catch (e) {
errorlog(e);
}
}
} else {
session.sendRequest({scale:scale});
}
} }
if (e.data.UUID){
session.sendRequest({scale:scale}, UUID);
} else if (e.data.target){
for (var i in session.rpcs) {
try {
if ("streamID" in session.rpcs[i]) {
if ("target" in e.data) {
if ((session.rpcs[i].streamID == e.data.target) || (e.data.target == "*")) { // specify a stream ID or let it apply to all videos
session.sendRequest({scale:scale}, i);
}
} else {
session.sendRequest({scale:scale}, i);
}
}
} catch (e) {
errorlog(e);
}
}
} else {
session.sendRequest({scale:scale});
}
} }

File diff suppressed because one or more lines are too long