srizan/archived-vdo.ninja
1
0
Fork 0
mirror of https://github.com/SrIzan10/vdo.ninja.git synced 2026-05-01 11:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

limittotalbitrate mobile and desktop dual option

Browse Source
This commit is contained in:
steveseguin
2023-09-29 04:56:20 -04:00
parent 1a6378edbb
commit a930d77d08
4 changed files with 72 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
index.html
View File

@@ -92,7 +92,7 @@
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=49"></script>
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/aes.js"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=695"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=696"></script>
<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>
<div id="header">
@@ -2630,11 +2630,11 @@
// session.hidehome = true; // If used, 'hide home' will make the landing page inaccessible, along with hiding a few go-home elements.
// session.record = false; // uncomment to block users from being able to record via vdo.ninja's built in recording function
</script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=916"></script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=917"></script>
<!--
// 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" crossorigin="anonymous" id="main-js" src="./main.js?ver=736"></script>
<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=737"></script>
</body>
</html>

42
lib.js
View File

@@ -82,7 +82,8 @@ var miscTranslations = { // i can replace this list from time to time from the g
"share-a-screen": "Share a screen",
"stop-screen-sharing": "Stop screen sharing",
"you-have-been-transferred": "You've been transferred to a different room",
"you-have-been-activated": "The director has allowed you to see others in the room now",
"you-have-been-activated": "The director has now allowed you to see others in the room",
"you-not-yet-activated": "Please wait until the director brings you into the room",
"you-are-no-longer-a-co-director": "You are no longer a co-director as you were transferred.",
"transferred": "Transferred",
"room-changed": "Your room has changed",
@@ -1045,7 +1046,22 @@ function youveBeenTransferred(){
}
function youveBeenActivated(){
getChatMessage( getTranslation("you-have-been-activated"), label = false, director = false, overlay = true); // "you-have-been-transferred"
if (session.queueType==3){ // session.queue is now set to false
getById("overlayMsgs").innerText = "";
for (var UUID in session.pcs){
if (session.pcs[UUID].needsPublishing){
session.initialPublish(UUID); // let's starts publishing now
}
}
} else if (session.queueType==4){
getById("overlayMsgs").innerText = "";
}
getChatMessage( getTranslation("you-have-been-activated"), label = false, director = false, overlay = true);
hideHomeCheck();
}
function youreWaitingToBeActivated(){
getChatMessage( getTranslation("you-not-yet-activated"), label = false, director = false, overlay = true);
hideHomeCheck();
}
@@ -5537,7 +5553,7 @@ function updateMixerRun(e=false){ // this is the main auto-mixing code. It's a
// log(vw + " : "+vh);
if (cover){
if (cover && !session.structure){ //////
if ((("rotated" in vid) && ((vid.rotated==90) || (vid.rotated==270)))){
holder.style.left = borderOffset + "px";
holder.style.top = borderOffset + "px";
@@ -5595,6 +5611,7 @@ function updateMixerRun(e=false){ // this is the main auto-mixing code. It's a
holder.style.borderRadius = borderRadius+"px";
} else if ((vw && vh) || (vid.width && vid.height) || vid.dataset.aspectRatio){
if (("rotated" in vid) && ((vid.rotated==90) || (vid.rotated==270))){
if (vw && vh){
var vvw = parseInt(vh);
@@ -5627,7 +5644,7 @@ function updateMixerRun(e=false){ // this is the main auto-mixing code. It's a
var asw = (wrw - videoMargin*2 - borderOffset*2)/vvw; // (window.innerWidth/ N) / vid.videoHeight;
var ash = (hrh - videoMargin*2 - borderOffset*2)/vvh;
if (session.structure){
if (session.structure){
// wrw x hrh
var arx = (wrw - videoMargin*2 - borderOffset*2)/(hrh - videoMargin*2 - borderOffset*2);
var tarx = arW/arH;
@@ -16358,8 +16375,10 @@ function joinRoom(roomname) {
var streamID = session.desaltStreamID(response[i].streamID);
if (session.queue){
if (session.directorList.indexOf(response[i].UUID)>=0){
warnlog("PLAYING DIRECTOR");
play(streamID, response[i].UUID);
if (session.queueType==2){
warnlog("PLAYING DIRECTOR");
play(streamID, response[i].UUID);
}
} else if (session.view_set && session.view_set.includes(streamID)){
play(streamID, response[i].UUID);
} else if (session.queueList.length<5000){
@@ -16388,7 +16407,9 @@ function joinRoom(roomname) {
var streamID = session.desaltStreamID(response[i].streamID);
if (session.queue){
if (session.directorList.indexOf(response[i].UUID)>=0){
play(streamID, response[i].UUID);
if (session.queueType==2){
play(streamID, response[i].UUID);
}
} else if (session.view_set && session.view_set.includes(streamID)){
play(streamID, response[i].UUID);
} else if (session.queueList.length<5000){
@@ -24352,6 +24373,8 @@ session.postPublish = async function(){
if (session.welcomeMessage){
stickyMessage(session.welcomeMessage);
// getChatMessage(session.welcomeMessage, false, true, true);
} else if (session.queue && ((session.queueType==3) || (session.queueType==4)) && !session.director){
youreWaitingToBeActivated();
}
if (session.welcomeImage){
@@ -32032,7 +32055,9 @@ function getChatMessage(msg, label = false, director = false, overlay = false) {
showtime = 8000;
}
setTimeout(function(ele) {
ele.parentNode.removeChild(ele);
try {
ele.parentNode.removeChild(ele);
} catch(e){}
}, showtime, spanOverlay);
}
}
@@ -38215,6 +38240,7 @@ async function createSecondStream2(UUID){
session.pcs[UUID+"_screen"].order = false;
session.pcs[UUID+"_screen"].preferVideoCodec = false;
session.pcs[UUID+"_screen"].startTime = Date.now();
session.pcs[UUID+"_screen"].needsPublishing = null;
// session.pcs[UUID+"_screen"].rotation = false; I don't think this will ever be used?
// we will use allowVideo/allowAudio from the main UUID parent

27
main.js
View File

@@ -3240,7 +3240,16 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
}
if (urlParams.has('limittotalbitrate') || urlParams.has('ltb')){
session.limitTotalBitrate = urlParams.get('limittotalbitrate') || urlParams.get('ltb') || 2500;
session.limitTotalBitrate = urlParams.get('limittotalbitrate') || urlParams.get('ltb') || "2500";
if (session.limitTotalBitrate.split(",").length>1){
if (session.mobile){
session.limitTotalBitrate = session.limitTotalBitrate.split(",")[1];
} else {
session.limitTotalBitrate = session.limitTotalBitrate.split(",")[0];
}
}
session.limitTotalBitrate = parseInt(session.limitTotalBitrate);
}
@@ -4160,9 +4169,25 @@ async function main(){ // main asyncronous thread; mostly initializes the user s
session.queue = false;
} else if (urlParams.get('queue') === "off"){
session.queue = false;
} else if (urlParams.get('queue')){
session.queue = urlParams.get('queue');
}
}
if (urlParams.has('queue2') || urlParams.has('screen')) { // the guest can see the director, if the director doesn't have &queue
session.queue = true;
session.queueType = 2;
}
if (urlParams.has('queue3') || urlParams.has('hold')) { // the guest can't see the director until approved, but does get a messaging telling them to wait.
session.queue = true;
session.queueType = 3;
}
if (urlParams.has('queue4') || urlParams.has('holdwithvideo')) { // the guest can't see the director until approved, but does get a messaging telling them to wait.
session.queue = true;
session.queueType = 4;
}
if (urlParams.has('push') || urlParams.has('id') || urlParams.has('permaid') ) {

10
webrtc.js
View File

File diff suppressed because one or more lines are too long