summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'webapp')
-rw-r--r--webapp/client/webrtc_session.jsx2
-rw-r--r--webapp/components/webrtc/webrtc_controller.jsx12
-rw-r--r--webapp/package.json2
3 files changed, 8 insertions, 8 deletions
diff --git a/webapp/client/webrtc_session.jsx b/webapp/client/webrtc_session.jsx
index 1fccddff3..9ee7fcd5a 100644
--- a/webapp/client/webrtc_session.jsx
+++ b/webapp/client/webrtc_session.jsx
@@ -21,7 +21,7 @@ export default class WebrtcSession {
navigator.mediaDevices.getUserMedia(media).
then((stream) => {
if (element) {
- adapter.browserShim.attachMediaStream(element, stream);
+ element.srcObject = stream;
}
if (callback && typeof callback === 'function') {
diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx
index f9cf241d5..968f24638 100644
--- a/webapp/components/webrtc/webrtc_controller.jsx
+++ b/webapp/components/webrtc/webrtc_controller.jsx
@@ -172,10 +172,8 @@ export default class WebrtcController extends React.Component {
{
audio: true,
video: {
- mandatory: {
- minAspectRatio: MIN_ASPECT,
- maxAspectRatio: MAX_ASPECT
- },
+ minAspectRatio: MIN_ASPECT,
+ maxAspectRatio: MAX_ASPECT,
width: VIDEO_WIDTH,
height: VIDEO_HEIGHT
}
@@ -726,8 +724,10 @@ export default class WebrtcController extends React.Component {
this.videocall.hangup();
this.toggleIcons();
- this.localMedia.getVideoTracks()[0].enabled = true;
- this.localMedia.getAudioTracks()[0].enabled = true;
+ if (this.localMedia) {
+ this.localMedia.getVideoTracks()[0].enabled = true;
+ this.localMedia.getAudioTracks()[0].enabled = true;
+ }
}
if (error) {
diff --git a/webapp/package.json b/webapp/package.json
index 394cb02f1..f1d07a475 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -33,7 +33,7 @@
"superagent": "2.1.0",
"twemoji": "2.0.5",
"velocity-animate": "1.2.3",
- "webrtc-adapter": "1.4.0",
+ "webrtc-adapter": "2.0.3",
"xregexp": "3.1.1"
},
"devDependencies": {