haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add `deviceId` which was used to create `JitsiLocalTrack` to the object to re-use it when unmuting the track 

Fixes the issue that when creating local tracks with specific devices after unmuting the new tracks were created with default devices again.
This commit is contained in:
Thorsten Basse 2016-01-19 13:40:42 +11:00
parent 8066d03d3e
commit a61cacb5e1
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/RTC/JitsiLocalTrack.js
View File

@ -8,11 +8,12 @@ var RTCUtils = require("./RTCUtils");
* @constructor
*/
function JitsiLocalTrack(stream, videoType,
resolution)
resolution, deviceId)
{
this.videoType = videoType;
this.dontFireRemoveEvent = false;
this.resolution = resolution;
this.deviceId = deviceId;
this.startMuted = false;
var self = this;
JitsiTrack.call(this, null, stream,
@ -71,9 +72,16 @@ JitsiLocalTrack.prototype._setMute = function (mute) {
//FIXME: Maybe here we should set the SRC for the containers to something
} else {
var self = this;
RTCUtils.obtainAudioAndVideoPermissions({
var streamOptions = {
devices: (isAudio ? ["audio"] : ["video"]),
resolution: self.resolution})
resolution: self.resolution
};
if (isAudio) {
streamOptions['micDeviceId'] = self.deviceId;
} else {self.videoType === 'camera'} {
streamOptions['cameraDeviceId'] = self.deviceId;
}
RTCUtils.obtainAudioAndVideoPermissions(streamOptions)
.then(function (streams) {
var stream = null;
for(var i = 0; i < streams.length; i++) {

15
modules/RTC/RTC.js
View File

@ -11,11 +11,17 @@ var DesktopSharingEventTypes
var MediaStreamType = require("../../service/RTC/MediaStreamTypes");
var RTCEvents = require("../../service/RTC/RTCEvents.js");
function createLocalTracks(streams) {
function createLocalTracks(streams, options) {
var newStreams = []
var deviceId = null;
for (var i = 0; i < streams.length; i++) {
if (streams[i].type === 'audio') {
deviceId = options.micDeviceId;
} else if (streams[i].videoType === 'camera'){
deviceId = options.cameraDeviceId;
}
var localStream = new JitsiLocalTrack(streams[i].stream,
streams[i].videoType, streams[i].resolution);
streams[i].videoType, streams[i].resolution, deviceId);
newStreams.push(localStream);
if (streams[i].isMuted === true)
localStream.setMute(true);
@ -73,8 +79,11 @@ function RTC(room, options) {
* @param {string} options.micDeviceId
* @returns {*} Promise object that will receive the new JitsiTracks
*/
RTC.obtainAudioAndVideoPermissions = function (options) {
return RTCUtils.obtainAudioAndVideoPermissions(options).then(createLocalTracks);
return RTCUtils.obtainAudioAndVideoPermissions(options).then(function (streams) {
return createLocalTracks(streams, options);
});
}
RTC.prototype.onIncommingCall = function(event) {