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

openvidu-browser: prepare iosrtc new version

pull/375/head
CSantos 2019-12-05 12:21:42 +01:00
parent 53550e96f9
commit 86f288cfe2
2 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -817,11 +817,11 @@ export class Stream implements EventDispatcher {
} }
private remotePeerSuccessfullyEstablished(): void { private remotePeerSuccessfullyEstablished(): void {
/*if (platform['isIonicIos']) { if (platform['isIonicIos']) {
// iOS Ionic. LIMITATION: must use deprecated WebRTC API // iOS Ionic. LIMITATION: must use deprecated WebRTC API
const pc1: any = this.webRtcPeer.pc; const pc1: any = this.webRtcPeer.pc;
this.mediaStream = pc1.getRemoteStreams()[0]; this.mediaStream = pc1.getRemoteStreams()[0];
} else {*/ } else {
this.mediaStream = new MediaStream(); this.mediaStream = new MediaStream();
let receiver: RTCRtpReceiver; let receiver: RTCRtpReceiver;
for (receiver of this.webRtcPeer.pc.getReceivers()) { for (receiver of this.webRtcPeer.pc.getReceivers()) {
@ -829,7 +829,7 @@ export class Stream implements EventDispatcher {
this.mediaStream.addTrack(receiver.track); this.mediaStream.addTrack(receiver.track);
} }
} }
// } }
console.debug('Peer remote stream', this.mediaStream); console.debug('Peer remote stream', this.mediaStream);
if (!!this.mediaStream) { if (!!this.mediaStream) {

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

@ -86,15 +86,9 @@ export class WebRtcPeer {
reject('The peer connection object is in "closed" state. This is most likely due to an invocation of the dispose method before accepting in the dialogue'); reject('The peer connection object is in "closed" state. This is most likely due to an invocation of the dispose method before accepting in the dialogue');
} }
if (!!this.configuration.mediaStream) { if (!!this.configuration.mediaStream) {
/*if (platform['isIonicIos']) { for (const track of this.configuration.mediaStream.getTracks()) {
// iOS Ionic. LIMITATION: must use deprecated WebRTC API this.pc.addTrack(track, this.configuration.mediaStream);
const pc2: any = this.pc; }
pc2.addStream(this.configuration.mediaStream);
} else {*/
for (const track of this.configuration.mediaStream.getTracks()) {
this.pc.addTrack(track, this.configuration.mediaStream);
}
// }
resolve(); resolve();
} }
}); });
@ -112,41 +106,21 @@ export class WebRtcPeer {
} }
this.remoteCandidatesQueue = []; this.remoteCandidatesQueue = [];
this.localCandidatesQueue = []; this.localCandidatesQueue = [];
// Stop senders
/* if (platform['isIonicIos']) { for (const sender of this.pc.getSenders()) {
// iOS Ionic. LIMITATION: must use deprecated WebRTC API if (!videoSourceIsMediaStreamTrack) {
// Stop senders deprecated if (!!sender.track) {
const pc1: any = this.pc; sender.track.stop();
for (const sender of pc1.getLocalStreams()) {
if (!videoSourceIsMediaStreamTrack) {
sender.stop();
}
pc1.removeStream(sender);
}
// Stop receivers deprecated
for (const receiver of pc1.getRemoteStreams()) {
if (!!receiver.track) {
receiver.stop();
} }
} }
} else {*/ this.pc.removeTrack(sender);
// Stop senders }
for (const sender of this.pc.getSenders()) { // Stop receivers
if (!videoSourceIsMediaStreamTrack) { for (const receiver of this.pc.getReceivers()) {
if (!!sender.track) { if (!!receiver.track) {
sender.track.stop(); receiver.track.stop();
}
}
this.pc.removeTrack(sender);
} }
// Stop receivers }
for (const receiver of this.pc.getReceivers()) {
if (!!receiver.track) {
receiver.track.stop();
}
}
// }
this.pc.close(); this.pc.close();
} }
} catch (err) { } catch (err) {