diff --git a/packages/node_modules/@ciscospark/react-component-video/src/index.js b/packages/node_modules/@ciscospark/react-component-video/src/index.js
index 3ce006c52..e80985cd5 100644
--- a/packages/node_modules/@ciscospark/react-component-video/src/index.js
+++ b/packages/node_modules/@ciscospark/react-component-video/src/index.js
@@ -3,13 +3,21 @@ import classNames from 'classnames';
import styles from './styles.css';
-export default function Video({src, audioMuted}) {
+export default function Video({src, srcObject, audioMuted}) {
// Need autoPlay to start the video automagically
+
+ function getEl(el) {
+ if (el && srcObject) {
+ el.srcObject = srcObject;
+ }
+ }
+
return (
);
@@ -17,5 +25,6 @@ export default function Video({src, audioMuted}) {
Video.propTypes = {
audioMuted: PropTypes.bool,
- src: PropTypes.string.isRequired
+ src: PropTypes.string,
+ srcObject: PropTypes.object
};
diff --git a/packages/node_modules/@ciscospark/redux-module-media/src/reducer.js b/packages/node_modules/@ciscospark/redux-module-media/src/reducer.js
index baee1d5c5..48c9e07b4 100644
--- a/packages/node_modules/@ciscospark/redux-module-media/src/reducer.js
+++ b/packages/node_modules/@ciscospark/redux-module-media/src/reducer.js
@@ -63,8 +63,8 @@ export default function reducer(state = initialState, action) {
sendingVideo: call.sendingVideo,
localAudioDirection: call.localAudioDirection,
localVideoDirection: call.localVideoDirection,
- remoteMediaStreamUrl: call.remoteMediaStreamUrl,
- localMediaStreamUrl: call.localMediaStreamUrl,
+ remoteMediaStream: call.remoteMediaStream,
+ localMediaStream: call.localMediaStream,
remoteAudioMuted,
remoteVideoMuted
};
@@ -75,7 +75,7 @@ export default function reducer(state = initialState, action) {
const mediaState = {
localAudioDirection: call.localAudioDirection,
localVideoDirection: call.localVideoDirection,
- localMediaStreamUrl: call.localMediaStreamUrl
+ localMediaStream: call.localMediaStream
};
return state.mergeIn([`callState`], mediaState);
}
@@ -86,7 +86,7 @@ export default function reducer(state = initialState, action) {
receivingVideo: call.receivingVideo,
sendingAudio: call.sendingAudio,
sendingVideo: call.sendingVideo,
- remoteMediaStreamUrl: call.remoteMediaStreamUrl
+ remoteMediaStream: call.remoteMediaStream
};
return state.mergeIn([`callState`], mediaState);
}
@@ -117,8 +117,8 @@ export default function reducer(state = initialState, action) {
.set(`call`, call)
.setIn([`status`, `isConnected`], true)
.setIn([`status`, `isDialing`], false)
- .setIn([`callState`, `localMediaStreamUrl`], call.localMediaStreamUrl)
- .setIn([`callState`, `remoteMediaStreamUrl`], call.remoteMediaStreamUrl)
+ .setIn([`callState`, `localMediaStream`], call.localMediaStream)
+ .setIn([`callState`, `remoteMediaStream`], call.remoteMediaStream)
.set(`callStartTime`, Date.parse(call.locus.fullState.lastActive));
}
case CALL_DISCONNECTED: {
diff --git a/packages/node_modules/@ciscospark/widget-meet/src/components/call-active/index.js b/packages/node_modules/@ciscospark/widget-meet/src/components/call-active/index.js
index 587c88ccb..5ca3fc668 100644
--- a/packages/node_modules/@ciscospark/widget-meet/src/components/call-active/index.js
+++ b/packages/node_modules/@ciscospark/widget-meet/src/components/call-active/index.js
@@ -19,12 +19,12 @@ export default function ActiveCall({
onStartSendingVideo,
onStopSendingAudio,
onStopSendingVideo,
- localMediaStreamUrl,
- remoteMediaStreamUrl,
+ localMediaStream,
+ remoteMediaStream,
toPersonAvatar,
toPersonName
}) {
- const connectedClass = remoteMediaStreamUrl && styles.callConnected;
+ const connectedClass = remoteMediaStream && remoteMediaStream.active && styles.callConnected;
const {
sendingAudio,
sendingVideo
@@ -54,8 +54,8 @@ export default function ActiveCall({
);
- if (remoteMediaStreamUrl && !callState.remoteVideoMuted) {
- remoteView = ;
+ if (remoteMediaStream && remoteMediaStream.active && !callState.remoteVideoMuted) {
+ remoteView = ;
}
return (
@@ -64,7 +64,7 @@ export default function ActiveCall({
{ remoteView }
{
- localMediaStreamUrl && sendingVideo &&
+ localMediaStream && localMediaStream.active && sendingVideo &&