Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sdp overhaul #1234

Merged
merged 10 commits into from
Jan 19, 2017
Merged

Sdp overhaul #1234

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e8e086f
M1: device change now uses new flow. fundamentally "works" but may b…
bbaldino Dec 22, 2016
c041298
M2: change toggle screenshare flows to use the new video replacement …
bbaldino Jan 6, 2017
4bfe9fe
remove the old 'useVideoStream' and replace it with the new one
bbaldino Jan 9, 2017
1205754
use the new (and renamed back from the shim) 'dispose' method
bbaldino Jan 9, 2017
ce0fbec
tweaks to work with the sdp overhaul changes in lib-jitsi-meet
bbaldino Jan 10, 2017
03aaba6
change the order in which we call dispose (to handle dispose being re…
bbaldino Jan 11, 2017
495fe49
move useAudioStream over to new flow
bbaldino Jan 11, 2017
327dc5f
restore useVideoStream doc
bbaldino Jan 11, 2017
3c8333f
handle rename JitsiConference::replaceStream -> JitsiConference::repl…
bbaldino Jan 18, 2017
fc32e96
fix useAudioStream and useVideoStream to return a promise again
bbaldino Jan 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 56 additions & 61 deletions conference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,43 +915,40 @@ export default {
return options;
},

/**
* Start using provided video stream.
* Stops previous video stream.
* @param {JitsiLocalTrack} [stream] new stream to use or null
* @returns {Promise}
*/
useVideoStream (stream) {
let promise = Promise.resolve();
if (localVideo) {
// this calls room.removeTrack internally
// so we don't need to remove it manually
promise = localVideo.dispose();
}
localVideo = stream;

return promise.then(function () {
if (stream) {
return room.addTrack(stream);
}
}).then(() => {
if (stream) {
this.videoMuted = stream.isMuted();
this.isSharingScreen = stream.videoType === 'desktop';

APP.UI.addLocalStream(stream);

stream.videoType === 'camera'
&& APP.UI.setCameraButtonEnabled(true);
} else {
this.videoMuted = false;
this.isSharingScreen = false;
}
/**
* Start using provided video stream.
* Stops previous video stream.
* @param {JitsiLocalTrack} [stream] new stream to use or null
* @returns {Promise}
*/
useVideoStream (newStream) {
return room.replaceTrack(localVideo, newStream)
.then(() => {
// We call dispose after doing the replace because
// dispose will try and do a new o/a after the
// track removes itself. Doing it after means
// the JitsiLocalTrack::conference member is already
// cleared, so it won't try and do the o/a
if (localVideo) {
localVideo.dispose();
}
localVideo = newStream;
if (newStream) {
this.videoMuted = newStream.isMuted();
this.isSharingScreen = newStream.videoType === 'desktop';

APP.UI.setVideoMuted(this.getMyUserId(), this.videoMuted);
APP.UI.addLocalStream(newStream);

APP.UI.updateDesktopSharingButtons();
});
newStream.videoType === 'camera'
&& APP.UI.setCameraButtonEnabled(true);
} else {
this.videoMuted = false;
this.isSharingScreen = false;
}
APP.UI.setVideoMuted(this.getMyUserId(), this.videoMuted);
APP.UI.updateDesktopSharingButtons();
});
},

/**
Expand All @@ -960,31 +957,27 @@ export default {
* @param {JitsiLocalTrack} [stream] new stream to use or null
* @returns {Promise}
*/
useAudioStream (stream) {
let promise = Promise.resolve();
if (localAudio) {
// this calls room.removeTrack internally
// so we don't need to remove it manually
promise = localAudio.dispose();
}
localAudio = stream;

return promise.then(function () {
if (stream) {
return room.addTrack(stream);
}
}).then(() => {
if (stream) {
this.audioMuted = stream.isMuted();

APP.UI.addLocalStream(stream);
} else {
this.audioMuted = false;
}

APP.UI.setMicrophoneButtonEnabled(true);
APP.UI.setAudioMuted(this.getMyUserId(), this.audioMuted);
});
useAudioStream (newStream) {
return room.replaceTrack(localAudio, newStream)
.then(() => {
// We call dispose after doing the replace because
// dispose will try and do a new o/a after the
// track removes itself. Doing it after means
// the JitsiLocalTrack::conference member is already
// cleared, so it won't try and do the o/a
if (localAudio) {
localAudio.dispose();
}
localAudio = newStream;
if (newStream) {
this.audioMuted = newStream.isMuted();
APP.UI.addLocalStream(newStream);
} else {
this.audioMuted = false;
}
APP.UI.setMicrophoneButtonEnabled(true);
APP.UI.setAudioMuted(this.getMyUserId(), this.audioMuted);
});
},

videoSwitchInProgress: false,
Expand Down Expand Up @@ -1307,11 +1300,13 @@ export default {
this.deviceChangeListener);

// stop local video
if (localVideo)
if (localVideo) {
localVideo.dispose();
}
// stop local audio
if (localAudio)
if (localAudio) {
localAudio.dispose();
}

// show overlay
APP.UI.showSuspendedOverlay();
Expand Down