MigrateRepos/decentralized-video-chat
1
0
Fork 0
mirror of https://github.com/ianramzy/decentralized-video-chat.git synced 2025-02-23 00:15:04 +08:00
Code Issues Releases Wiki Activity

Color fix and removed redundant definition of borderColor

Browse Source
This commit is contained in:
Arya Vohra 2020-06-03 17:53:55 +08:00
parent 38ead5c785
commit 04c9f14d08
1 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
public/js/chat.js
View File

@ -32,7 +32,6 @@ var dataChannel = new Map();
var VideoChat = { var VideoChat = {
videoEnabled: true, videoEnabled: true,
audioEnabled: true, audioEnabled: true,
borderColor: `hsl(${Math.floor(Math.random() * 360)}, 70%, 80%)`,
connected: new Map(), connected: new Map(),
localICECandidates: {}, localICECandidates: {},
socket: io(), socket: io(),
@ -364,11 +363,11 @@ var VideoChat = {
// Hide caption status text // Hide caption status text
captionText.fadeOut(); captionText.fadeOut();
// Downscale send resolution and bitrate if num in room > 4 // Downscale send resolution and bitrate if num in room > 4
if (VideoChat.peerConnections.size > 3) { // if (VideoChat.peerConnections.size > 3) {
VideoChat.peerConnections.forEach(function (value, key, map) { // VideoChat.peerConnections.forEach(function (value, key, map) {
downscaleStream(value); // downscaleStream(value);
}); // });
} // }
// Reposition local video after a second, as there is often a delay // Reposition local video after a second, as there is often a delay
// between adding a stream and the height of the video div changing // between adding a stream and the height of the video div changing
setTimeout(() => rePositionLocalVideo(), 500); setTimeout(() => rePositionLocalVideo(), 500);
@ -508,30 +507,30 @@ function sendToAllDataChannels(message) {
// End Fullscreen // End Fullscreen
// Downscale single stream // Downscale single stream
async function downscaleStream(pc, applying = false) { // async function downscaleStream(pc, applying = false) {
height = 240; // height = 240;
rate = 800000; // rate = 800000;
if (applying) return; // if (applying) return;
try { // try {
applying = true; // applying = true;
do { // do {
h = height; // h = height;
const sender = pc.getSenders().find(function (s) { // const sender = pc.getSenders().find(function (s) {
return s.track.kind === "video"; // return s.track.kind === "video";
}); // });
const ratio = sender.track.getSettings().height / height; // const ratio = sender.track.getSettings().height / height;
const params = sender.getParameters(); // const params = sender.getParameters();
if (!params.encodings) params.encodings = [{}]; // Firefox workaround! // if (!params.encodings) params.encodings = [{}]; // Firefox workaround!
params.encodings[0].scaleResolutionDownBy = Math.max(ratio, 1); // params.encodings[0].scaleResolutionDownBy = Math.max(ratio, 1);
params.encodings[0].maxBitrate = rate; // params.encodings[0].maxBitrate = rate;
await sender.setParameters(params); // await sender.setParameters(params);
} while (h != height); // } while (h != height);
} catch (e) { // } catch (e) {
logIt(e); // logIt(e);
} finally { // } finally {
applying = false; // applying = false;
} // }
} // }
// Mute microphone // Mute microphone
function muteMicrophone() { function muteMicrophone() {
@ -902,20 +901,20 @@ function uuidToColor(uuid) {
} }
var hue = Math.abs(hash % 360); var hue = Math.abs(hash % 360);
// Ensure color is not similar to other colors // Ensure color is not similar to other colors
var availColors = Array.from({ length: 18 }, (x, i) => i * 20); var availColors = Array.from({ length: 9 }, (x, i) => i * 40);
VideoChat.peerColors.forEach(function (value, key, map) { VideoChat.peerColors.forEach(function (value, key, map) {
availColors[Math.floor(value / 20)] = null; availColors[Math.floor(value / 40)] = null;
}); });
if (availColors[Math.floor(hue / 20)] == null) { if (availColors[Math.floor(hue / 40)] == null) {
for (var i = 0; i < availColors.length; i++) { for (var i = 0; i < availColors.length; i++) {
if (availColors[i] != null) { if (availColors[i] != null) {
hue = (hue % 20) + availColors[i]; hue = (hue % 40) + availColors[i];
availColors[i] = null; availColors[i] = null;
break; break;
} }
} }
} }
return `hsl(${hue},100%,70%)`; return `hsl(${hue},100%,60%)`;
} }
// Sets the border color of uuid's stream // Sets the border color of uuid's stream