Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Fix p2p sample page issues #115,#108 #118

Merged
merged 1 commit into from
Mar 28, 2019
Merged

Fix p2p sample page issues #115,#108 #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/samples/p2p/peercall.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<h1>Intel<sup>&reg;</sup> Collaboration Suite for WebRTC</h1>
<h2>P2P Sample</h2>
<div id="description">
<p>This sample works with the latest Chrome and FireFox.</p>
<p>This sample works with the latest Chrome and Firefox.</p>
</div>
<div id="control">
<p>
Expand All @@ -73,6 +73,7 @@ <h2>P2P Sample</h2>
<p>
<button id="target-video-publish">Share Camera</button>
<button id="target-video-unpublish">Stop Camera Sharing</button>
<button id="target-peerconnection-stop">Stop Conversation</button>
<button id="target-screen">Share Screen</button>
</p>
</div>
Expand Down Expand Up @@ -128,6 +129,7 @@ <h2>ScreenView</h2>
}, signaling);
var localStream;
var localScreen;
var screenStream;

var getTargetId = function() {
return $('#remote-uid').val();
Expand Down Expand Up @@ -156,9 +158,9 @@ <h2>ScreenView</h2>
let mediaStream;
Owt.Base.MediaStreamFactory.createMediaStream(config).then(stream => {
mediaStream = stream;
ScreenStream = new Owt.Base.LocalStream(mediaStream, new Owt.Base.StreamSourceInfo('screen-cast', 'screen-cast'));
$('#local').children('video').get(0).srcObject = ScreenStream.mediaStream;
p2p.publish(getTargetId(), ScreenStream).then(publication=>{
screenStream = new Owt.Base.LocalStream(mediaStream, new Owt.Base.StreamSourceInfo('screen-cast', 'screen-cast'));
$('#local').children('video').get(0).srcObject = screenStream.mediaStream;
p2p.publish(getTargetId(), screenStream).then(publication=>{
publicationForScreen = publication;
}), error => {
console.log('Failed to share screen.');
Expand Down Expand Up @@ -206,8 +208,8 @@ <h2>ScreenView</h2>
}
});

$('#target-disconnect').click(function() {
p2p.stop($('#target-uid').val()); // Stop chat
$('#target-peerconnection-stop').click(function() {
p2p.stop($('#remote-uid').val()); // Stop conversation
});

$('#login').click(function() {
Expand Down Expand Up @@ -252,7 +254,7 @@ <h2>ScreenView</h2>
});

window.onbeforeunload = function() {
p2p.stop($('#target-uid').val());
p2p.stop($('#remote-uid').val());
}
</script>
</body>