mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-13 13:07:06 +00:00
FS-11370 [verto_communicator] verto may rely on device labels to assure correct mic/cam selection
This commit is contained in:
Marcell Guilherme Costa da Silva committed
1 parent
e4d85ee6aa
commit
5075e54425
3 files changed
+90
-32
No files matched your search
@@ -455,9 +455,11 @@
|
||||
audio: false,
|
||||
video: { deviceId: params.useCamera },
|
||||
},
|
||||
localVideo: self.options.localVideo,
|
||||
localVideo: self.options.localVideo,
|
||||
useCameraLabel: self.options.useCameraLabel,
|
||||
useMicLabel: self.options.useMicLabel,
|
||||
onsuccess: function(e) {self.options.localVideoStream = e; console.log("local video ready");},
|
||||
onerror: function(e) {console.error("local video error!");}
|
||||
onerror: function(e) {console.error("local video error!", e);}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -477,6 +479,8 @@
|
||||
video: mediaParams.video
|
||||
},
|
||||
video: mediaParams.useVideo,
|
||||
useCameraLabel: self.options.useCameraLabel,
|
||||
useMicLabel: self.options.useMicLabel,
|
||||
onsuccess: onSuccess,
|
||||
onerror: onError
|
||||
});
|
||||
@@ -504,7 +508,7 @@
|
||||
|
||||
if (obj.options.useMic !== "any") {
|
||||
//audio.optional = [{sourceId: obj.options.useMic}];
|
||||
audio.deviceId = {exact: obj.options.useMic};
|
||||
audio.deviceId = assignMediaIdToConstraint(obj.options.useMic);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -514,9 +518,11 @@
|
||||
audio: false,
|
||||
video: { deviceId: obj.options.useCamera },
|
||||
},
|
||||
localVideo: obj.options.localVideo,
|
||||
localVideo: obj.options.localVideo,
|
||||
useCameraLabel: obj.options.useCameraLabel,
|
||||
useMicLabel: obj.options.useMicLabel,
|
||||
onsuccess: function(e) {obj.options.localVideoStream = e; console.log("local video ready");},
|
||||
onerror: function(e) {console.error("local video error!");}
|
||||
onerror: function(e) {console.error("local video error!", e); }
|
||||
});
|
||||
}
|
||||
|
||||
@@ -571,9 +577,7 @@
|
||||
|
||||
if (obj.options.useCamera !== "any") {
|
||||
//video.optional.push({sourceId: obj.options.useCamera});
|
||||
video.deviceId = {
|
||||
exact: obj.options.useCamera,
|
||||
};
|
||||
video = assignMediaIdToConstraint(obj.options.useCamera, video);
|
||||
}
|
||||
|
||||
if (bestFrameRate) {
|
||||
@@ -661,7 +665,6 @@
|
||||
onSuccess(self.options.useStream);
|
||||
}
|
||||
else if (mediaParams.audio || mediaParams.video) {
|
||||
|
||||
getUserMedia({
|
||||
constraints: {
|
||||
audio: mediaParams.audio,
|
||||
@@ -669,7 +672,9 @@
|
||||
},
|
||||
video: mediaParams.useVideo,
|
||||
onsuccess: onSuccess,
|
||||
onerror: onError
|
||||
onerror: onError,
|
||||
useCameraLabel: self.options.useCameraLabel,
|
||||
useMicLabel: self.options.useMicLabel,
|
||||
});
|
||||
|
||||
} else {
|
||||
@@ -977,32 +982,77 @@
|
||||
el.style.display = 'none';
|
||||
}
|
||||
|
||||
function getUserMedia(options) {
|
||||
var n = navigator,
|
||||
media;
|
||||
n.getMedia = n.getUserMedia;
|
||||
n.getMedia(options.constraints || {
|
||||
audio: true,
|
||||
video: video_constraints
|
||||
},
|
||||
streaming, options.onerror ||
|
||||
function(e) {
|
||||
console.error(e);
|
||||
});
|
||||
function assureConstraintByLabel(constraint, fallbackLabel) {
|
||||
if (fallbackLabel === undefined && constraint === undefined) {
|
||||
return Promise.resolve(constraint);
|
||||
}
|
||||
|
||||
function streaming(stream) {
|
||||
if (typeof(assureMediaInputId) !== 'function') {
|
||||
console.warn('Tried to use constraint fallbacks but did not found vendor function `assureMediaInputId` on window scope. Did you forget to import `vendor/media-device-id.js` before Verto?');
|
||||
return Promise.resolve(constraint);
|
||||
}
|
||||
|
||||
if (typeof(constraint) === 'object' && !constraint.deviceId) {
|
||||
return Promise.resolve(constraint);
|
||||
}
|
||||
|
||||
if (constraint.deviceId) {
|
||||
if (typeof(constraint.deviceId) === 'string') {
|
||||
return new Promise(function(resolve) {
|
||||
assureMediaInputId(fallbackLabel, constraint.deviceId).then(function(id) {
|
||||
resolve(Object.assign({}, constraint, { deviceId: id }));
|
||||
}).catch(function() {
|
||||
resolve(constraint);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
if (typeof(constraint.deviceId) === 'object' && typeof(constraint.deviceId.exact) === 'string') {
|
||||
return new Promise(function(resolve) {
|
||||
assureMediaInputId(fallbackLabel, constraint.deviceId.exact).then(function(id) {
|
||||
resolve(assignMediaIdToConstraint(id, constraint));
|
||||
}).catch(function() {
|
||||
resolve(constraint);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return Promise.resolve(constraint);
|
||||
}
|
||||
|
||||
function trustyGetUserMedia(options, constraints) {
|
||||
navigator.mediaDevices.getUserMedia(constraints).then(function(stream) {
|
||||
if (options.localVideo) {
|
||||
activateLocalVideo(options.localVideo, stream);
|
||||
activateLocalVideo(options.localVideo, stream);
|
||||
}
|
||||
|
||||
if (options.onsuccess) {
|
||||
options.onsuccess(stream);
|
||||
}
|
||||
}).catch(options.onerror || function(e) {
|
||||
console.error(e);
|
||||
});
|
||||
}
|
||||
|
||||
media = stream;
|
||||
}
|
||||
function assignMediaIdToConstraint(mediaId, rest) {
|
||||
return Object.assign({}, rest || {}, { deviceId: { exact: mediaId } });
|
||||
}
|
||||
|
||||
return media;
|
||||
function getUserMedia(options) {
|
||||
var constraints = options.constraints || {
|
||||
audio: true,
|
||||
video: video_constraints,
|
||||
};
|
||||
|
||||
Promise.all([
|
||||
assureConstraintByLabel(constraints.audio, options.useMicLabel),
|
||||
assureConstraintByLabel(constraints.video, options.useCameraLabel),
|
||||
]).then(function(assurances) {
|
||||
trustyGetUserMedia(options, { audio: assurances[0], video: assurances[1] });
|
||||
}).catch(function(error) {
|
||||
console.error('Unexpected error on media id assurance attempts:', error, 'Options:', options);
|
||||
});
|
||||
}
|
||||
|
||||
$.FSRTC.resSupported = function(w, h) {
|
||||
@@ -1056,9 +1106,7 @@
|
||||
};
|
||||
|
||||
if (cam !== "any") {
|
||||
video.deviceId = {
|
||||
exact: cam,
|
||||
};
|
||||
video = assignMediaIdToConstraint(cam, video);
|
||||
}
|
||||
|
||||
getUserMedia({
|
||||
|
||||
@@ -462,6 +462,7 @@
|
||||
|
||||
if (args["useCamera"]) {
|
||||
verto.options.deviceParams["useCamera"] = args["useCamera"];
|
||||
verto.options.deviceParams["useCameraLabel"] = args["useCameraLabel"];
|
||||
}
|
||||
|
||||
var dialog = new $.verto.dialog($.verto.enum.direction.outbound, this, args);
|
||||
@@ -1938,6 +1939,7 @@
|
||||
screenShare: false,
|
||||
useCamera: false,
|
||||
useMic: verto.options.deviceParams.useMic,
|
||||
useMicLabel: verto.options.deviceParams.useMicLabel,
|
||||
useSpeak: verto.options.deviceParams.useSpeak,
|
||||
tag: verto.options.tag,
|
||||
localTag: verto.options.localTag,
|
||||
@@ -1949,6 +1951,7 @@
|
||||
|
||||
if (!dialog.params.screenShare) {
|
||||
dialog.params.useCamera = verto.options.deviceParams.useCamera;
|
||||
dialog.params.useCameraLabel = verto.options.deviceParams.useCameraLabel;
|
||||
}
|
||||
|
||||
dialog.verto = verto;
|
||||
@@ -1960,7 +1963,9 @@
|
||||
dialog.attach = params.attach || false;
|
||||
dialog.screenShare = params.screenShare || false;
|
||||
dialog.useCamera = dialog.params.useCamera;
|
||||
dialog.useCameraLabel = dialog.params.useCameraLabel;
|
||||
dialog.useMic = dialog.params.useMic;
|
||||
dialog.useMicLabel = dialog.params.useMicLabel;
|
||||
dialog.useSpeak = dialog.params.useSpeak;
|
||||
|
||||
if (dialog.params.callID) {
|
||||
@@ -2099,7 +2104,9 @@
|
||||
iceServers: verto.options.iceServers,
|
||||
screenShare: dialog.screenShare,
|
||||
useCamera: dialog.useCamera,
|
||||
useCameraLabel: dialog.useCameraLabel,
|
||||
useMic: dialog.useMic,
|
||||
useMicLabel: dialog.useMicLabel,
|
||||
useSpeak: dialog.useSpeak,
|
||||
turnServer: verto.options.turnServer,
|
||||
useStream: dialog.params.useStream
|
||||
@@ -2551,11 +2558,13 @@
|
||||
dialog.params.callee_id_number = params.callee_id_number;
|
||||
|
||||
if (params.useCamera) {
|
||||
dialog.useCamera = params.useCamera;
|
||||
dialog.useCamera = params.useCamera;
|
||||
dialog.useCameraLabel = params.useCameraLabel;
|
||||
}
|
||||
|
||||
if (params.useMic) {
|
||||
dialog.useMic = params.useMic;
|
||||
dialog.useMic = params.useMic;
|
||||
dialog.useMic = params.useMicLabel;
|
||||
}
|
||||
|
||||
if (params.useSpeak) {
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/* Under MIT License by Mazuh. Original source code at: https://github.com/Mazuh/media-device-id */ !function(t){var r={};function e(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return t[n].call(o.exports,o,o.exports,e),o.l=!0,o.exports}e.m=t,e.c=r,e.d=function(t,r,n){e.o(t,r)||Object.defineProperty(t,r,{enumerable:!0,get:n})},e.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},e.t=function(t,r){if(1&r&&(t=e(t)),8&r)return t;if(4&r&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(e.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&r&&"string"!=typeof t)for(var o in t)e.d(n,o,function(r){return t[r]}.bind(null,o));return n},e.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(r,"a",r),r},e.o=function(t,r){return Object.prototype.hasOwnProperty.call(t,r)},e.p="",e(e.s=2)}([function(t,r,e){t.exports=e(3)},function(t,r){function e(t,r,e,n,o,i,a){try{var u=t[i](a),c=u.value}catch(t){return void e(t)}u.done?r(c):Promise.resolve(c).then(n,o)}t.exports=function(t){return function(){var r=this,n=arguments;return new Promise(function(o,i){var a=t.apply(r,n);function u(t){e(a,o,i,u,c,"next",t)}function c(t){e(a,o,i,u,c,"throw",t)}u(void 0)})}}},function(t,r,e){"use strict";e.r(r),e.d(r,"assureMediaInputId",function(){return u});var n=e(0),o=e.n(n),i=e(1),a=e.n(i);function u(t,r,e){return c.apply(this,arguments)}function c(){return(c=a()(o.a.mark(function t(r,e,n){var i,a,u,c,f,s,l,h,p,v,d;return o.a.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return i=function(t){return t.kind.indexOf("input")>-1},t.next=3,navigator.mediaDevices.enumerateDevices().then(function(t){return{ok:t.filter(i)}}).catch(function(t){return{err:t}});case 3:if(!(a=t.sent).err){t.next=6;break}throw String(a.err);case 6:if(u=a.ok,c=function(t){return t&&t.label},f=u.every(c),s=function(t){return t.label&&t.label==r},l=function(t){return t.deviceId==e},h=function(t){return l(t)},p=u.find(h),v=function(t){return l(t)||s(t)},d=u.find(v),p||f){t.next=19;break}if(void 0===n){t.next=18;break}return t.abrupt("return",n);case 18:throw"Could not assure device, id is wrong and labels are unavailable";case 19:if(p||d){t.next=23;break}if(void 0===n){t.next=22;break}return t.abrupt("return",n);case 22:throw"Could not assure device, not found by label nor id";case 23:return t.abrupt("return",p?p.deviceId:d.deviceId);case 24:case"end":return t.stop()}},t,this)}))).apply(this,arguments)}void 0!==window&&(window.assureMediaInputId=u)},function(t,r,e){var n=function(){return this||"object"==typeof self&&self}()||Function("return this")(),o=n.regeneratorRuntime&&Object.getOwnPropertyNames(n).indexOf("regeneratorRuntime")>=0,i=o&&n.regeneratorRuntime;if(n.regeneratorRuntime=void 0,t.exports=e(4),o)n.regeneratorRuntime=i;else try{delete n.regeneratorRuntime}catch(t){n.regeneratorRuntime=void 0}},function(t,r){!function(r){"use strict";var e,n=Object.prototype,o=n.hasOwnProperty,i="function"==typeof Symbol?Symbol:{},a=i.iterator||"@@iterator",u=i.asyncIterator||"@@asyncIterator",c=i.toStringTag||"@@toStringTag",f="object"==typeof t,s=r.regeneratorRuntime;if(s)f&&(t.exports=s);else{(s=r.regeneratorRuntime=f?t.exports:{}).wrap=b;var l="suspendedStart",h="suspendedYield",p="executing",v="completed",d={},y={};y[a]=function(){return this};var g=Object.getPrototypeOf,m=g&&g(g(F([])));m&&m!==n&&o.call(m,a)&&(y=m);var w=O.prototype=L.prototype=Object.create(y);E.prototype=w.constructor=O,O.constructor=E,O[c]=E.displayName="GeneratorFunction",s.isGeneratorFunction=function(t){var r="function"==typeof t&&t.constructor;return!!r&&(r===E||"GeneratorFunction"===(r.displayName||r.name))},s.mark=function(t){return Object.setPrototypeOf?Object.setPrototypeOf(t,O):(t.__proto__=O,c in t||(t[c]="GeneratorFunction")),t.prototype=Object.create(w),t},s.awrap=function(t){return{__await:t}},j(_.prototype),_.prototype[u]=function(){return this},s.AsyncIterator=_,s.async=function(t,r,e,n){var o=new _(b(t,r,e,n));return s.isGeneratorFunction(r)?o:o.next().then(function(t){return t.done?t.value:o.next()})},j(w),w[c]="Generator",w[a]=function(){return this},w.toString=function(){return"[object Generator]"},s.keys=function(t){var r=[];for(var e in t)r.push(e);return r.reverse(),function e(){for(;r.length;){var n=r.pop();if(n in t)return e.value=n,e.done=!1,e}return e.done=!0,e}},s.values=F,N.prototype={constructor:N,reset:function(t){if(this.prev=0,this.next=0,this.sent=this._sent=e,this.done=!1,this.delegate=null,this.method="next",this.arg=e,this.tryEntries.forEach(I),!t)for(var r in this)"t"===r.charAt(0)&&o.call(this,r)&&!isNaN(+r.slice(1))&&(this[r]=e)},stop:function(){this.done=!0;var t=this.tryEntries[0].completion;if("throw"===t.type)throw t.arg;return this.rval},dispatchException:function(t){if(this.done)throw t;var r=this;function n(n,o){return u.type="tLine truncated
|
||||
Reference in new issue
Block a user