Skip to content

Commit

Permalink
screen.js, RTCMultiConnection-v1.8, part-fo-screen demo, updated.
Browse files Browse the repository at this point in the history
  • Loading branch information
muaz-khan committed Jun 6, 2014
1 parent 3839ad6 commit 055a4b9
Show file tree
Hide file tree
Showing 13 changed files with 786 additions and 1,845 deletions.
175 changes: 76 additions & 99 deletions RTCMultiConnection/Library/RTCMultiConnection-v1.8.js

Large diffs are not rendered by default.

620 changes: 0 additions & 620 deletions RTCMultiConnection/RTCMultiConnection-v1.2-and-earlier.md

This file was deleted.

547 changes: 0 additions & 547 deletions RTCMultiConnection/RTCMultiConnection-v1.3.md

This file was deleted.

98 changes: 0 additions & 98 deletions RTCMultiConnection/changes-log.md

This file was deleted.

15 changes: 15 additions & 0 deletions RTCMultiConnection/changes-log/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,21 @@ <h2 id="v1.8"><a href="http://www.rtcmulticonnection.org/changes-log/#v1.8">v1.8

<ol>

<li>
<code>captureUserMediaOnDemand</code> added for <code>connection.open</code> method:
<pre class="sh_javascript">
// it is enabled by default
// it means that "getUserMedia" API for initiator will
// be invoked only when required.
// i.e. when first participant is detected.

// you can disable it by setting it to "false"
connection.open({
captureUserMediaOnDemand: false
});
</pre>
</li>

<li>
<code>connection.DetectRTC.screen.getChromeExtensionStatus</code> added.
<pre class="sh_javascript">
Expand Down
17 changes: 14 additions & 3 deletions RTCMultiConnection/demos/remote-stream-forwarding.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<link rel="author" type="text/html" href="https://plus.google.com/+MuazKhan">
<meta name="author" content="Muaz Khan">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

<link rel="stylesheet" href="https://www.webrtc-experiment.com/style.css">

<style>
Expand Down Expand Up @@ -58,7 +59,6 @@
document.createElement('footer');
</script>

<!-- scripts used for video-conferencing -->
<script src="https://www.webrtc-experiment.com/RTCMultiConnection-v1.8.js"> </script>
<script src="https://www.webrtc-experiment.com/firebase.js"> </script>
</head>
Expand Down Expand Up @@ -91,6 +91,10 @@ <h1>
</header>

<div class="github-stargazers"></div>

<blockquote class="inner" style="text-align: center;">
Chrome is <a href="https://code.google.com/p/webrtc/issues/detail?id=2192#c15">still not supporting</a> remote audio forwarding. It will forward only remote <strong>video</strong> stream.
</blockquote>

<section class="experiment">
<div id="videos-container"></div>
Expand Down Expand Up @@ -160,7 +164,12 @@ <h2>How to use?</h2>

// http://www.rtcmulticonnection.org/docs/onstream/
mainConnection.onstream = function(e) {
dummyConnection.attachStreams.push(e.stream /* .clone() */ );
if(mainConnection.UA.Chrome) {
// chrome doesn't yet permits remote audio forwarding
// https://code.google.com/p/webrtc/issues/detail?id=2192#c15
var stream = new webkitMediaStream( e.stream.getVideoTracks() );
dummyConnection.attachStreams.push(stream);
}
videosContainer.appendChild(e.mediaElement);
document.querySelector('#forward-main-session').disabled = false;
};
Expand Down Expand Up @@ -196,7 +205,9 @@ <h2>How to use?</h2>
this.disabled = true;

// http://www.rtcmulticonnection.org/docs/open/
dummyConnection.open();
dummyConnection.open({
captureUserMediaOnDemand: false
});
};
</script>
</section>
Expand Down
Loading

0 comments on commit 055a4b9

Please sign in to comment.