PLT-4788 Fixed video on remote toggle (#4949)

Этот коммит содержится в:
enahum
2017-01-03 19:10:09 -03:00
коммит произвёл Harrison Healey
родитель 55c8283b85
Коммит 3ae8e9789e
2 изменённых файлов: 7 добавлений и 9 удалений

Просмотреть файл

@@ -1080,9 +1080,8 @@ export default class WebrtcController extends React.Component {
const currentId = UserStore.getCurrentId(); const currentId = UserStore.getCurrentId();
const remoteImage = (<img src={this.state.remoteUserImage}/>); const remoteImage = (<img src={this.state.remoteUserImage}/>);
let localImage; let localImage;
let localVideoHidden; let localVideoHidden = '';
let remoteVideoHidden = 'hidden'; let remoteVideoHidden = 'hidden';
let remoteVideoHiddenLocal = 'full';
let error; let error;
let remoteMute; let remoteMute;
let videoClass = ''; let videoClass = '';
@@ -1173,11 +1172,9 @@ export default class WebrtcController extends React.Component {
if (this.state.isRemotePaused) { if (this.state.isRemotePaused) {
remoteVideoHidden = 'hidden'; remoteVideoHidden = 'hidden';
remoteVideoHiddenLocal = 'full';
remoteImageHidden = 'webrtc__remote-image'; remoteImageHidden = 'webrtc__remote-image';
} else { } else {
remoteVideoHidden = ''; remoteVideoHidden = '';
remoteVideoHiddenLocal = '';
remoteImageHidden = 'webrtc__remote-image hidden'; remoteImageHidden = 'webrtc__remote-image hidden';
} }
} else { } else {
@@ -1211,7 +1208,7 @@ export default class WebrtcController extends React.Component {
</div> </div>
<div <div
id='local-video' id='local-video'
className={localVideoHidden + ' ' + remoteVideoHiddenLocal} className={localVideoHidden}
> >
<video <video
ref='local-video' ref='local-video'

Просмотреть файл

@@ -343,9 +343,10 @@ function Janus(gatewayCallbacks) {
} }
} }
var iceServers = gatewayCallbacks.iceServers; var iceServers = gatewayCallbacks.iceServers;
if(iceServers === undefined || iceServers === null || iceServers.length === 0) if(iceServers === undefined || iceServers === null || iceServers.length === 0) {
iceServers = [{urls: "stun:stun.l.google.com:19302"}]; iceServers = [{urls: "stun:stun.l.google.com:19302"}];
console.log('using ice', iceServers); Janus.log('using ice', iceServers);
}
var iceTransportPolicy = gatewayCallbacks.iceTransportPolicy; var iceTransportPolicy = gatewayCallbacks.iceTransportPolicy;
// Whether IPv6 candidates should be gathered // Whether IPv6 candidates should be gathered
var ipv6Support = gatewayCallbacks.ipv6; var ipv6Support = gatewayCallbacks.ipv6;
@@ -2020,7 +2021,7 @@ function Janus(gatewayCallbacks) {
Janus.warn("No video track"); Janus.warn("No video track");
return false; return false;
} }
config.myStream.getVideoTracks()[0].enabled = mute ? false : true; config.myStream.getVideoTracks()[0].enabled = mute;
return true; return true;
} else { } else {
// Mute/unmute audio track // Mute/unmute audio track
@@ -2030,7 +2031,7 @@ function Janus(gatewayCallbacks) {
Janus.warn("No audio track"); Janus.warn("No audio track");
return false; return false;
} }
config.myStream.getAudioTracks()[0].enabled = mute ? false : true; config.myStream.getAudioTracks()[0].enabled = mute;
return true; return true;
} }
} }