elias/vdo.ninja
1
0
Fork 0
mirror of https://github.com/eliasstepanik/vdo.ninja.git synced 2026-01-10 21:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for &cover and &border

Browse Source
This commit is contained in:
steveseguin 2023-04-21 11:40:57 -04:00
parent 361ab7a3f6
commit 329121c395
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
check.html
View File

@ -115,8 +115,8 @@
<h2>
The next step will access your camera and microphone.<br /><br />
<br />
Accept the camera and microphone permissions if prompted.<br />
<small>No one will be able to see your video or audio, other than you.</small>
Accept the camera and microphone permissions if prompted.<br /><br />
<small><i>No one will be able to see your video or audio, other than you.</i></small>
<br /><br />
<img src='./media/accept.png'/><br />
🌠🌠🌠<button onclick="next3();">Continue</button>⭐

4
index.html
View File

@ -83,7 +83,7 @@
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/CodecsHandler.js?ver=47"></script>
<script type="text/javascript" crossorigin="anonymous" src="./thirdparty/aes.js"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=619"></script>
<script type="text/javascript" crossorigin="anonymous" src="./webrtc.js?ver=622"></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">
@ -2475,7 +2475,7 @@
// 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=764"></script>
<script type="text/javascript" crossorigin="anonymous" id="lib-js" src="./lib.js?ver=766"></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>

23
lib.js
View File

@ -5191,6 +5191,8 @@ function updateMixerRun(e=false){ // this is the main auto-mixing code. It's a
vid.style.left = 0;
vid.style.top = 0;
}
} else if ((vw && vh) || (vid.width && vid.height) || vid.dataset.aspectRatio){
if (("rotated" in vid) && ((vid.rotated==90) || (vid.rotated==270))){
if (vw && vh){
@ -5264,19 +5266,8 @@ function updateMixerRun(e=false){ // this is the main auto-mixing code. It's a
holder.style.height = Math.ceil(hsh) + 'px';
//holder.style.padding = videoMargin + "px";
vid.style.borderRadius = borderRadius+"px";
vid.style.borderColor = borderColor;
vid.style.borderWidth = borderOffset+"px";
//vid.style.backgroundColor = borderColor;
if (session.colorVideosBackground){
vid.style.backgroundColor = session.colorVideosBackground;
//} else if (borderOffset){
// vid.style.backgroundColor = borderColor;
} else {
vid.style.backgroundColor = "unset";
}
if (("rotated" in vid) && ((vid.rotated==90) || (vid.rotated==270))){
vid.style.width = Math.ceil(wrw - borderOffset*2) + "px";
@ -5298,7 +5289,6 @@ function updateMixerRun(e=false){ // this is the main auto-mixing code. It's a
vid.style.position = "relative";
}
} else if ((session.blurBackground!==false) && (vid.nodeName == "VIDEO") && !container.blurred && vid.srcObject && (( asw>1 && ash>1) || asw>=1 || ash>=1)){
vid.srcObject.getVideoTracks().forEach(trk=>{
@ -5336,6 +5326,15 @@ function updateMixerRun(e=false){ // this is the main auto-mixing code. It's a
holder.style.width = "calc(100% - "+((borderOffset + videoMargin*2))+"px)";
}
vid.style.borderRadius = borderRadius+"px";
vid.style.borderColor = borderColor;
vid.style.borderWidth = borderOffset+"px";
if (session.colorVideosBackground){
vid.style.backgroundColor = session.colorVideosBackground;
} else {
vid.style.backgroundColor = "unset";
}
if (vid.dataset.UUID && session.rpcs[vid.dataset.UUID] && ("label" in session.rpcs[vid.dataset.UUID]) && (session.rpcs[vid.dataset.UUID].label !== false) && (session.showlabels===true)){ // remote source