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

openvidu-browser: Safari video attributes. iOS Ionic bug fix (setRemoteDescription delayed)

pull/173/head
pabloFuente 2018-12-05 11:19:40 +01:00
parent 0e80c9b626
commit b0bc3d40d2
6 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openvidu-browser/src/OpenVidu/LocalRecorder.ts
View File

@ -202,7 +202,7 @@ export class LocalRecorder {
this.videoPreview.id = this.id;
this.videoPreview.autoplay = true;
if (platform.name === 'Safari' && platform.product === 'iPhone') {
if (platform.name === 'Safari') {
this.videoPreview.setAttribute('playsinline', 'true');
}

6
openvidu-browser/src/OpenVidu/Publisher.ts
View File

@ -293,7 +293,7 @@ export class Publisher extends StreamManager {
this.videoReference = document.createElement('video');
if (platform.name === 'Safari' && platform.product === 'iPhone') {
if (platform.name === 'Safari') {
this.videoReference.setAttribute('playsinline', 'true');
}
@ -314,8 +314,8 @@ export class Publisher extends StreamManager {
if (this.stream.isSendVideo()) {
if (!this.stream.isSendScreen()) {
if (platform['isIonicIos']) {
// iOS Ionic. Limitation: cannot set videoDimensions directly, as the videoReference is not loaded
if (platform['isIonicIos'] || platform.name === 'Safari') {
// iOS Ionic or Safari. Limitation: cannot set videoDimensions directly, as the videoReference is not loaded
// if not added to DOM. Must add it to DOM and wait for videoWidth and videoHeight properties to be defined
this.videoReference.style.display = 'none';

17
openvidu-browser/src/OpenVidu/Session.ts
View File

@ -77,6 +77,15 @@ export class Session implements EventDispatcher {
*/
remoteStreamsCreated: ObjMap<boolean> = {};
/**
* @hidden
*/
isFirstIonicIosSubscriber: boolean = true;
/**
* @hidden
*/
countDownForIonicIosSubscribers: boolean = true;
/**
* @hidden
*/
@ -658,6 +667,10 @@ export class Session implements EventDispatcher {
streamEvent.callDefaultBehavior();
delete this.remoteStreamsCreated[stream.streamId];
if (Object.keys(this.remoteStreamsCreated).length === 0) {
this.isFirstIonicIosSubscriber = true;
this.countDownForIonicIosSubscribers = true;
}
}
delete this.remoteConnections[connection.connectionId];
this.ee.emitEvent('connectionDestroyed', [new ConnectionEvent(false, this, 'connectionDestroyed', connection, msg.reason)]);
@ -727,6 +740,10 @@ export class Session implements EventDispatcher {
// Deleting the remote stream
const streamId: string = connection.stream.streamId;
delete this.remoteStreamsCreated[streamId];
if (Object.keys(this.remoteStreamsCreated).length === 0) {
this.isFirstIonicIosSubscriber = true;
this.countDownForIonicIosSubscribers = true;
}
connection.removeStream(streamId);
})
.catch(openViduError => {

13
openvidu-browser/src/OpenVidu/Stream.ts
View File

@ -623,7 +623,7 @@ export class Stream implements EventDispatcher {
reject('Error on publishVideo: ' + JSON.stringify(error));
}
} else {
this.webRtcPeer.processAnswer(response.sdpAnswer)
this.webRtcPeer.processAnswer(response.sdpAnswer, false)
.then(() => {
this.streamId = response.id;
this.isLocalStreamPublished = true;
@ -682,7 +682,16 @@ export class Stream implements EventDispatcher {
if (error) {
reject(new Error('Error on recvVideoFrom: ' + JSON.stringify(error)));
} else {
this.webRtcPeer.processAnswer(response.sdpAnswer).then(() => {
// Ios Ionic. Limitation: some bug in iosrtc cordova plugin makes
// it necessary to add a timeout before processAnswer method
if (this.session.isFirstIonicIosSubscriber) {
this.session.isFirstIonicIosSubscriber = false;
this.session['iosInterval'] = setTimeout(() => {
this.session.countDownForIonicIosSubscribers = false;
}, 400);
}
const needsTimeoutOnProcessAswer = this.session.countDownForIonicIosSubscribers;
this.webRtcPeer.processAnswer(response.sdpAnswer, needsTimeoutOnProcessAswer).then(() => {
this.remotePeerSuccessfullyEstablished();
this.initWebRtcStats();
resolve();

4
openvidu-browser/src/OpenVidu/StreamManager.ts
View File

@ -113,7 +113,7 @@ export class StreamManager implements EventDispatcher {
video: document.createElement('video'),
id: ''
};
if (platform.name === 'Safari' && platform.product === 'iPhone') {
if (platform.name === 'Safari') {
this.firstVideoElement.video.setAttribute('playsinline', 'true');
}
this.targetElement = targEl;
@ -334,7 +334,7 @@ export class StreamManager implements EventDispatcher {
video.autoplay = true;
video.controls = false;
if (platform.name === 'Safari' && platform.product === 'iPhone') {
if (platform.name === 'Safari') {
video.setAttribute('playsinline', 'true');
}

12
openvidu-browser/src/OpenViduInternal/WebRtcPeer/WebRtcPeer.ts
View File

@ -266,7 +266,7 @@ export class WebRtcPeer {
* 3) Function invoked when a SDP answer is received. Final step in SDP negotiation, the peer
* just needs to set the answer as its remote description
*/
processAnswer(sdpAnswer: string): Promise<string> {
processAnswer(sdpAnswer: string, needsTimeoutOnProcessAswer: boolean): Promise<string> {
return new Promise((resolve, reject) => {
const answer: RTCSessionDescriptionInit = {
@ -279,8 +279,14 @@ export class WebRtcPeer {
if (this.pc.signalingState === 'closed') {
reject('RTCPeerConnection is closed');
}
this.pc.setRemoteDescription(answer).then(() => resolve()).catch(error => reject(error));
if (needsTimeoutOnProcessAswer && platform['isIonicIos']) {
setTimeout(() => {
console.info('setRemoteDescription run after timout for iOS device');
this.pc.setRemoteDescription(answer).then(() => resolve()).catch(error => reject(error));
}, 250);
} else {
this.pc.setRemoteDescription(answer).then(() => resolve()).catch(error => reject(error));
}
});
}