diff --git a/examples/examples.json b/examples/examples.json index 5f3d0674..7a5d79b6 100644 --- a/examples/examples.json +++ b/examples/examples.json @@ -42,9 +42,15 @@ "type": "browser" }, { - "title": "SFU", - "link": "sfu", - "description": "The SFU example demonstrates how to broadcast a video to multiple peers. A broadcaster uploads the video once and the server forwards it to all other peers.", + "title": "Minimal SFU", + "link": "sfu-minimal", + "description": "The minimal SFU example demonstrates how to broadcast a video to multiple peers. A broadcaster uploads the video once and the server forwards it to all other peers.", + "type": "browser" + }, + { + "title": "WebSocket SFU", + "link": "#", + "description": "The Websocket SFU example demonstrates how to broadcast a video to multiple peers. This is similar to Minimal SFU, but all signaling is done via websockets like a more full featured application.", "type": "browser" } ] diff --git a/examples/gstreamer-receive/README.md b/examples/gstreamer-receive/README.md index c63ebf38..ce8ebf57 100644 --- a/examples/gstreamer-receive/README.md +++ b/examples/gstreamer-receive/README.md @@ -14,7 +14,7 @@ go get github.com/pions/webrtc/examples/gstreamer-receive ``` ### Open gstreamer-receive example page -[jsfiddle.net](https://jsfiddle.net/usd3xmtz/110/) you should see your Webcam, two text-areas and a 'Start Session' button +[jsfiddle.net](https://jsfiddle.net/pdm7bqfr/) you should see your Webcam, two text-areas and a 'Start Session' button ### Run gstreamer-receive with your browsers SessionDescription as stdin In the jsfiddle the top textarea is your browser, copy that and: diff --git a/examples/gstreamer-receive/jsfiddle/demo.js b/examples/gstreamer-receive/jsfiddle/demo.js index 197edf4b..8599c763 100644 --- a/examples/gstreamer-receive/jsfiddle/demo.js +++ b/examples/gstreamer-receive/jsfiddle/demo.js @@ -12,8 +12,10 @@ var log = msg => { } navigator.mediaDevices.getUserMedia({ video: true, audio: true }) - .then(stream => pc.addStream(document.getElementById('video1').srcObject = stream)) - .catch(log) + .then(stream => { + pc.addStream(document.getElementById('video1').srcObject = stream) + pc.createOffer().then(d => pc.setLocalDescription(d)).catch(log) + }).catch(log) pc.oniceconnectionstatechange = e => log(pc.iceConnectionState) pc.onicecandidate = event => { @@ -22,9 +24,6 @@ pc.onicecandidate = event => { } } -pc.onnegotiationneeded = e => - pc.createOffer().then(d => pc.setLocalDescription(d)).catch(log) - window.startSession = () => { let sd = document.getElementById('remoteSessionDescription').value if (sd === '') { diff --git a/examples/save-to-disk/README.md b/examples/save-to-disk/README.md index 7e21be6a..576577f7 100644 --- a/examples/save-to-disk/README.md +++ b/examples/save-to-disk/README.md @@ -8,7 +8,7 @@ go get github.com/pions/webrtc/examples/save-to-disk ``` ### Open save-to-disk example page -[jsfiddle.net](https://jsfiddle.net/dyj8qpek/19/) you should see your Webcam, two text-areas and a 'Start Session' button +[jsfiddle.net](https://jsfiddle.net/b3d72av1/) you should see your Webcam, two text-areas and a 'Start Session' button ### Run save-to-disk, with your browsers SessionDescription as stdin In the jsfiddle the top textarea is your browser, copy that and: diff --git a/examples/save-to-disk/jsfiddle/demo.js b/examples/save-to-disk/jsfiddle/demo.js index 197edf4b..8599c763 100644 --- a/examples/save-to-disk/jsfiddle/demo.js +++ b/examples/save-to-disk/jsfiddle/demo.js @@ -12,8 +12,10 @@ var log = msg => { } navigator.mediaDevices.getUserMedia({ video: true, audio: true }) - .then(stream => pc.addStream(document.getElementById('video1').srcObject = stream)) - .catch(log) + .then(stream => { + pc.addStream(document.getElementById('video1').srcObject = stream) + pc.createOffer().then(d => pc.setLocalDescription(d)).catch(log) + }).catch(log) pc.oniceconnectionstatechange = e => log(pc.iceConnectionState) pc.onicecandidate = event => { @@ -22,9 +24,6 @@ pc.onicecandidate = event => { } } -pc.onnegotiationneeded = e => - pc.createOffer().then(d => pc.setLocalDescription(d)).catch(log) - window.startSession = () => { let sd = document.getElementById('remoteSessionDescription').value if (sd === '') { diff --git a/examples/sfu-minimal/README.md b/examples/sfu-minimal/README.md index 75fe0e3a..9933f67a 100644 --- a/examples/sfu-minimal/README.md +++ b/examples/sfu-minimal/README.md @@ -10,7 +10,7 @@ go get github.com/pions/webrtc/examples/sfu-minimal ``` ### Open sfu-minimal example page -[jsfiddle.net](https://jsfiddle.net/5cwx0rns/11/) You should see two buttons 'Publish a Broadcast' and 'Join a Broadcast' +[jsfiddle.net](https://jsfiddle.net/4g03uqrx/) You should see two buttons 'Publish a Broadcast' and 'Join a Broadcast' ### Run SFU Minimal #### Linux/macOS diff --git a/examples/sfu-minimal/jsfiddle/demo.js b/examples/sfu-minimal/jsfiddle/demo.js index 17e6276b..a38ffa6a 100644 --- a/examples/sfu-minimal/jsfiddle/demo.js +++ b/examples/sfu-minimal/jsfiddle/demo.js @@ -20,13 +20,12 @@ window.createSession = isPublisher => { if (isPublisher) { navigator.mediaDevices.getUserMedia({ video: true, audio: false }) - .then(stream => pc.addStream(document.getElementById('video1').srcObject = stream)) - .catch(log) - pc.onnegotiationneeded = e => { - pc.createOffer() - .then(d => pc.setLocalDescription(d)) - .catch(log) - } + .then(stream => { + pc.addStream(document.getElementById('video1').srcObject = stream) + pc.createOffer() + .then(d => pc.setLocalDescription(d)) + .catch(log) + }).catch(log) } else { pc.createOffer({ offerToReceiveVideo: true }) .then(d => pc.setLocalDescription(d)) diff --git a/examples/sfu-ws/go.mod b/examples/sfu-ws/go.mod index e03bce10..7c342444 100644 --- a/examples/sfu-ws/go.mod +++ b/examples/sfu-ws/go.mod @@ -2,7 +2,6 @@ module github.com/pions/webrtc/examples/sfu-ws require ( github.com/gorilla/websocket v1.4.0 - github.com/pions/rtcp v1.1.0 - github.com/pions/transport v0.4.0 // indirect - github.com/pions/webrtc v1.2.1-0.20190311062446-43e0a64ba287 + github.com/pions/rtcp v1.1.2 + github.com/pions/webrtc v1.2.1-0.20190322201319-e3d9ad00da6d ) diff --git a/examples/sfu-ws/go.sum b/examples/sfu-ws/go.sum index 95869b8d..96fdb389 100644 --- a/examples/sfu-ws/go.sum +++ b/examples/sfu-ws/go.sum @@ -1,37 +1,61 @@ +github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/cloudflare/sidh v0.0.0-20181111220428-fc8e6378752b h1:pqwbJdj1rgMkE38tDSNnP97wdMYHzV+Lt/aLL2qw2LQ= github.com/cloudflare/sidh v0.0.0-20181111220428-fc8e6378752b/go.mod h1:o/DcCuWFr9jFzwO+c3y1hhwqKHHKfJ7HvLhWUwRnqfo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/pions/datachannel v1.2.0 h1:N12qhHSRVlgBcaal2Hi4skdz7VI4yz6bNC5IJDMzCNw= github.com/pions/datachannel v1.2.0/go.mod h1:MKPEKJRwX/a9/tyQvcVTUI9szyf8ZuUyZxSA9AVMSro= -github.com/pions/dtls v1.2.1/go.mod h1:OgJcO0SqrDdQzqkCTdAp4xCQlbCmwZtGyhbthbq9zIA= +github.com/pions/dtls v1.2.2 h1:izn/74bIBxVuHb+NdirkmWMH/yFNd8PBVXJgeH/ofGU= +github.com/pions/dtls v1.2.2/go.mod h1:5o0cLHyBEl8CvuA88enDDM6aBwn4SNo8md2dPhcynfc= +github.com/pions/logging v0.1.0 h1:vr+vInmjaRI06CqPWErEQpywxaqoIZcUjQ2eN68jRbk= +github.com/pions/logging v0.1.0/go.mod h1:duuz9/Se8ujqvq7OPzbnPpRlha6A0fk1Ba2wrbn4zew= +github.com/pions/qtls-vendor-extracted v0.0.0-20190210024908-018998217c65 h1:skcEQZ2eUdm1WKlYu7y1y0HBzOwa1pgSAwvhG6PrI2s= github.com/pions/qtls-vendor-extracted v0.0.0-20190210024908-018998217c65/go.mod h1:tSUehzG/8OAT3JvWvnovveLfRMM8NvgfN1LzwSrBX5s= +github.com/pions/quic v0.0.1 h1:SvloojnZl+wiaee/yKI88n/wQosFMCvatAKyxoRoiFQ= github.com/pions/quic v0.0.1/go.mod h1:q62rRbOZG6Keu45rWWljWZHXmB3H7fKdeJ1KtNcDrNQ= +github.com/pions/quic-go v0.7.1-0.20190211221741-ec20a8498576 h1:fD1z2bI0qf8yiZGDg5dxhVPP6xtsACP6FN5rDhpDVfM= github.com/pions/quic-go v0.7.1-0.20190211221741-ec20a8498576/go.mod h1:YvOsXPS6wXEfRGJobrsWSOBmlN6dkEIg+cUpnSDLkhc= -github.com/pions/rtcp v1.1.0 h1:WJarRpNaGE7aScgTXARaNIObMhIbftcbiPuhhqvDtl4= -github.com/pions/rtcp v1.1.0/go.mod h1:Q5twXlqiz775Yn37X0cl4lAsfSk8EiHgeNkte59jBY4= -github.com/pions/rtp v1.0.1/go.mod h1:GDIt4UYlSz7za4vfaLqihGJJ+yLvgPshnqrF/lm3vcM= +github.com/pions/rtcp v1.1.2 h1:gTb+GOvOYDRZb+3OgZz5PE51xrHGZL0WIM5X37dGi60= +github.com/pions/rtcp v1.1.2/go.mod h1:E8DBOVSErqbHrUEs8KINt3yhzO7FvKuZr2bVUKTvyaw= +github.com/pions/rtp v1.1.0 h1:aioiXSi2UclJptFRqmii76GTrlgry5ucCGtdKc+5VDs= +github.com/pions/rtp v1.1.0/go.mod h1:Bro/2l0PS5C3SQaEpLA+H34kpKIurx3K2Zln/nKjRMs= github.com/pions/sctp v1.3.0/go.mod h1:GZTG/xApE7wdUFEQq2Rmzgxl/+YaB/L1k8xUl1D5bmo= -github.com/pions/sctp v1.4.1/go.mod h1:dAna+Ct/aIIFiGW45yhGzuQjULWD7ni1vjoKHa9DsyU= +github.com/pions/sctp v1.4.2 h1:oOV8oLmGds2GZnIeGSHn8d385kwBxNeWNJ0kJOIR4yY= +github.com/pions/sctp v1.4.2/go.mod h1:Yws4nn6vR0npKJ2n2R+Cm+0JGaMKca0M1pYdGXovz3o= +github.com/pions/sdp/v2 v2.1.0 h1:YbbbaceX1aB6j3hPVdQ6GnniIRKqT/rmfnt4XvKR/E0= github.com/pions/sdp/v2 v2.1.0/go.mod h1:KGRBcHfpkgJXjrzKJz2wj/Jf1KWnsHdoIiqtayQ5QmE= -github.com/pions/srtp v1.1.0/go.mod h1:GvEoPJmI8sLqyjdPPdTZaCKNQ9e/+9OCCpck01s9uNQ= +github.com/pions/srtp v1.1.2 h1:mMhn9jsMUokSq+Owyviz6zw9BblBQhHiCB21kpP8KOE= +github.com/pions/srtp v1.1.2/go.mod h1:oQrU6IspEuRx9kdWeX2eb54y6F0ieS0J8GZayc9yZY0= +github.com/pions/stun v0.2.0 h1:spIzpfkEg6HV+2iIo6qeOsAjtadZKzbXbrd2e9ZCCcs= github.com/pions/stun v0.2.0/go.mod h1:rMdCIsqqnTLC4MOHJE3LNiFQRfIjUDzI1kzx//7oPOM= github.com/pions/transport v0.0.0-20190110151433-e7cbf7d5f464/go.mod h1:HLhzI7I0k8TyiQ99hfRZNRf84lG76eaFnZHnVy/wFnM= -github.com/pions/transport v0.1.0/go.mod h1:HLhzI7I0k8TyiQ99hfRZNRf84lG76eaFnZHnVy/wFnM= github.com/pions/transport v0.2.0/go.mod h1:HLhzI7I0k8TyiQ99hfRZNRf84lG76eaFnZHnVy/wFnM= github.com/pions/transport v0.4.0 h1:1N6fluzmj5W/16eFLDsCB18s/xEkjVTek0K4IJz75FU= github.com/pions/transport v0.4.0/go.mod h1:9gvUd8ZeyU4ZX7dhNuUq97mPoekopkd7eCJEyhKwVO0= -github.com/pions/webrtc v1.2.1-0.20190311062446-43e0a64ba287 h1:skL8VgjrCGaoMCL+o2cumZ1uyLdRtK12TuLLM5PT30o= -github.com/pions/webrtc v1.2.1-0.20190311062446-43e0a64ba287/go.mod h1:H4lYxyochp11YxW5AGmNam36neRoNDfPcqhSFUItaes= +github.com/pions/transport v0.5.0 h1:/KGBCzjc8bvVh8P5NP8GiSGL/PbupzhqvEOEBSlZux0= +github.com/pions/transport v0.5.0/go.mod h1:9gvUd8ZeyU4ZX7dhNuUq97mPoekopkd7eCJEyhKwVO0= +github.com/pions/webrtc v1.2.1-0.20190322201319-e3d9ad00da6d h1:gChqgEatznQP82KbaImYRl/pjRz5ZlNpPvj+xxGkwuY= +github.com/pions/webrtc v1.2.1-0.20190322201319-e3d9ad00da6d/go.mod h1:bULQFUfZKEwmttfL22pdn63E6ZMqbLk/pPhOXFGe6+w= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -39,12 +63,21 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2 h1:NwxKRvbkH5MsNkvOtPZi3/3kmI8CAzs3mtv+GLQMkNo= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/examples/sfu-ws/sfu.html b/examples/sfu-ws/sfu.html index 19a7eb66..d8a782ac 100644 --- a/examples/sfu-ws/sfu.html +++ b/examples/sfu-ws/sfu.html @@ -92,15 +92,12 @@ window.createSession = isPublisher => { navigator.mediaDevices.getUserMedia({ video: true, audio: true}) .then(stream => { pc.addStream(document.getElementById('video1').srcObject = stream) - dataChannel = pc.createDataChannel('data') - }) - .catch(log) - pc.onnegotiationneeded = e => { - pc.createOffer() - .then(d => pc.setLocalDescription(d)) - .catch(log) - } + .then(d => pc.setLocalDescription(d)) + .catch(log) + dataChannel = pc.createDataChannel('data') + }).catch(log) + } else { document.getElementById('msginput').style = 'display: none'