ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
8
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Audio-only also works if camera access is blocked but mic is allowed

pull/20/head
pabloFuente 2017-08-22 12:09:44 +02:00
parent ea78653374
commit 1754101d52
5 changed files with 67 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
openvidu-browser/src/main/resources/static/js/openvidu-browser-1.0.4-beta.1.js → openvidu-browser/src/main/resources/static/js/openvidu-browser-1.0.3-beta.2.js
View File

File diff suppressed because one or more lines are too long

2
openvidu-browser/src/main/resources/static/js/openvidu-browser-1.0.4-beta.1.min.js → openvidu-browser/src/main/resources/static/js/openvidu-browser-1.0.3-beta.2.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
openvidu-browser/src/main/resources/static/js/openvidu-browser-1.0.3-beta.2.min.js.map Normal file
View File

File diff suppressed because one or more lines are too long

1
openvidu-browser/src/main/resources/static/js/openvidu-browser-1.0.4-beta.1.min.js.map
View File

File diff suppressed because one or more lines are too long

54
openvidu-browser/src/main/resources/ts/OpenViduInternal/Stream.ts
View File

@ -374,32 +374,46 @@ export class Stream {
private requestCameraAccesAux(constraints, callback) { private requestCameraAccesAux(constraints, callback) {
navigator.mediaDevices.getUserMedia(constraints) navigator.mediaDevices.getUserMedia(constraints)
.then(userStream => { .then(userStream => {
this.accessIsAllowed = true; this.cameraAccessSuccess(userStream, callback);
this.accessIsDenied = false;
this.ee.emitEvent('access-allowed-by-publisher');
if (userStream.getAudioTracks()[0] != null) {
userStream.getAudioTracks()[0].enabled = this.sendAudio;
}
if (userStream.getVideoTracks()[0] != null) {
userStream.getVideoTracks()[0].enabled = this.sendVideo;
}
this.wrStream = userStream;
this.emitSrcEvent(this.wrStream);
callback(undefined, this);
}) })
.catch(error => { .catch(error => {
this.accessIsDenied = true; // Try to ask for microphone only
this.accessIsAllowed = false; navigator.mediaDevices.getUserMedia({ audio: true, video: false })
this.ee.emitEvent('access-denied-by-publisher'); .then(userStream => {
constraints.video = false;
this.sendVideo = false;
this.audioOnly = true;
this.cameraAccessSuccess(userStream, callback);
})
.catch(error => {
this.accessIsDenied = true;
this.accessIsAllowed = false;
this.ee.emitEvent('access-denied-by-publisher');
console.error("Access denied", error); console.error("Access denied", error);
callback(error, this); callback(error, this);
});
}); });
} }
private cameraAccessSuccess(userStream, callback) {
this.accessIsAllowed = true;
this.accessIsDenied = false;
this.ee.emitEvent('access-allowed-by-publisher');
if (userStream.getAudioTracks()[0] != null) {
userStream.getAudioTracks()[0].enabled = this.sendAudio;
}
if (userStream.getVideoTracks()[0] != null) {
userStream.getVideoTracks()[0].enabled = this.sendVideo;
}
this.wrStream = userStream;
this.emitSrcEvent(this.wrStream);
callback(undefined, this);
}
private userMediaHasVideo(callback) { private userMediaHasVideo(callback) {
navigator.mediaDevices.enumerateDevices().then(function (mediaDevices) { navigator.mediaDevices.enumerateDevices().then(function (mediaDevices) {
var videoInput = mediaDevices.filter(function (deviceInfo) { var videoInput = mediaDevices.filter(function (deviceInfo) {