BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored video service

Browse Source
This commit is contained in:
Pedro Beschorner Marin 2019-11-27 10:10:24 -03:00
parent debd8f714a
commit 59bc7f91a1
1 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
bigbluebutton-html5/imports/ui/components/multiple-video-provider/service.js
View File

@ -55,7 +55,7 @@ class VideoService {
}
exitVideo() {
if (this.sharingWebcam()) {
if (this.isConnected) {
logger.info({
logCode: 'video_provider_unsharewebcam',
}, `Sending unshare all ${Auth.userID} webcams notification to meteor`);
@ -89,10 +89,6 @@ class VideoService {
}
}
sharingWebcam() {
return this.isConnecting || this.isConnected;
}
sendUserShareWebcam(cameraId) {
makeCall('userShareWebcam', cameraId);
}
@ -106,15 +102,6 @@ class VideoService {
}
getVideoStreams() {
const localUser = Users.findOne(
{ userId: Auth.userID },
{
fields: {
name: 1, userId: 1,
},
},
);
const streams = VideoStreams.find(
{ meetingId: Auth.meetingID },
{
@ -124,23 +111,9 @@ class VideoService {
},
).fetch();
if (this.isConnecting) {
const deviceId = this.getCurrentDeviceId();
if (deviceId) {
const stream = this.buildStreamName(localUser.userId, deviceId);
if (!this.hasStream(streams, stream)) {
// This is how a new camera is shared and included in the VideoStream
// collection
streams.push({
stream,
userId: localUser.userId,
name: localUser.name,
});
} else {
this.isConnecting = false;
}
}
}
const connectingStream = this.getConnectingStream(streams);
if (connectingStream) streams.push(connectingStream);
return streams.map(vs => ({
cameraId: vs.stream,
@ -149,6 +122,29 @@ class VideoService {
})).sort(UserListService.sortUsersByName);
}
getConnectingStream(streams) {
let connectingStream;
if (this.isConnecting) {
const deviceId = this.getCurrentDeviceId();
if (deviceId) {
const stream = this.buildStreamName(Auth.userID, deviceId);
if (!this.hasStream(streams, stream)) {
connectingStream = {
stream,
userId: Auth.userID,
name: Auth.fullname,
};
} else {
// Connecting stream is already stored at database
this.isConnecting = false;
}
}
}
return connectingStream;
}
buildStreamName(userId, deviceId) {
return `${userId}${TOKEN}${deviceId}`;
}
@ -275,10 +271,9 @@ class VideoService {
isDisabled() {
const isLocked = this.disableCam() && this.isUserLocked();
const isConnecting = !this.hasVideoStream() && this.sharingWebcam();
const { viewParticipantsWebcams } = Settings.dataSaving;
return isLocked || isConnecting || !viewParticipantsWebcams;
return isLocked || this.isConnecting || !viewParticipantsWebcams;
}
getRole(isLocal) {