gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-20 11:15:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dont show publisher stream

Browse Source
This commit is contained in:
Mario Danic 2018-10-18 01:12:39 +02:00
parent 102f259f2a
commit 7a31c4c659
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -800,7 +800,7 @@ public class CallController extends BaseController {
} }
} else { } else {
for (int i = 0; i < magicPeerConnectionWrapperList.size(); i++) { for (int i = 0; i < magicPeerConnectionWrapperList.size(); i++) {
if (magicPeerConnectionWrapperList.get(i).getSessionId().equals(callSession)) { if (magicPeerConnectionWrapperList.get(i).getSessionId().equals(webSocketClient.getSessionId())) {
magicPeerConnectionWrapperList.get(i).sendChannelData(new DataChannelMessage(message)); magicPeerConnectionWrapperList.get(i).sendChannelData(new DataChannelMessage(message));
break; break;
@ -1280,7 +1280,7 @@ public class CallController extends BaseController {
magicPeerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick()); magicPeerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick());
SessionDescription sessionDescriptionWithPreferredCodec; SessionDescription sessionDescriptionWithPreferredCodec;
if (magicPeerConnectionWrapper.hasMediaStream() ) { if (magicPeerConnectionWrapper.hasMediaStream()) {
String sessionDescriptionStringWithPreferredCodec = MagicWebRTCUtils.preferCodec String sessionDescriptionStringWithPreferredCodec = MagicWebRTCUtils.preferCodec
(ncSignalingMessage.getPayload().getSdp(), (ncSignalingMessage.getPayload().getSdp(),
"VP8", false); "VP8", false);
@ -1480,7 +1480,7 @@ public class CallController extends BaseController {
return; return;
} }
if (newSessions.size() > 0) { if (newSessions.size() > 0 && !hasMCU) {
getPeersForCall(); getPeersForCall();
} }

10
app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
View File

@ -72,6 +72,7 @@ public class MagicPeerConnectionWrapper {
private boolean hasInitiated; private boolean hasInitiated;
private MediaStream localMediaStream; private MediaStream localMediaStream;
private boolean isMCUPublisher;
public MagicPeerConnectionWrapper(PeerConnectionFactory peerConnectionFactory, public MagicPeerConnectionWrapper(PeerConnectionFactory peerConnectionFactory,
List<PeerConnection.IceServer> iceServerList, List<PeerConnection.IceServer> iceServerList,
@ -86,6 +87,7 @@ public class MagicPeerConnectionWrapper {
magicSdpObserver = new MagicSdpObserver(); magicSdpObserver = new MagicSdpObserver();
hasInitiated = sessionId.compareTo(localSession) < 0; hasInitiated = sessionId.compareTo(localSession) < 0;
this.isMCUPublisher = isMCUPublisher;
peerConnection = peerConnectionFactory.createPeerConnection(iceServerList, mediaConstraints, peerConnection = peerConnectionFactory.createPeerConnection(iceServerList, mediaConstraints,
new MagicPeerConnectionObserver()); new MagicPeerConnectionObserver());
@ -266,7 +268,9 @@ public class MagicPeerConnectionWrapper {
if (iceConnectionState.equals(PeerConnection.IceConnectionState.CONNECTED)) { if (iceConnectionState.equals(PeerConnection.IceConnectionState.CONNECTED)) {
/*EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType /*EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
.PEER_CONNECTED, sessionId, null, null));*/ .PEER_CONNECTED, sessionId, null, null));*/
EventBus.getDefault().post(new MediaStreamEvent(remoteMediaStream, sessionId)); if (!isMCUPublisher) {
EventBus.getDefault().post(new MediaStreamEvent(remoteMediaStream, sessionId));
}
if (hasInitiated) { if (hasInitiated) {
sendInitialMediaStatus(); sendInitialMediaStatus();
@ -309,7 +313,9 @@ public class MagicPeerConnectionWrapper {
@Override @Override
public void onRemoveStream(MediaStream mediaStream) { public void onRemoveStream(MediaStream mediaStream) {
EventBus.getDefault().post(new MediaStreamEvent(null, sessionId)); if (!isMCUPublisher) {
EventBus.getDefault().post(new MediaStreamEvent(null, sessionId));
}
} }
@Override @Override