gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 21:19:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename sdpConstraints to mediaConstraints

Browse Source 
SDP is a native detail of the native WebRTC library.

Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2022-02-17 15:19:51 +01:00
parent 890dda0c68
commit 272ea7e846
No known key found for this signature in database
GPG Key ID: FECE3A7222C52A4E
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ public class MagicPeerConnectionWrapper {
private PeerConnection peerConnection; private PeerConnection peerConnection;
private String sessionId; private String sessionId;
private String nick; private String nick;
private final MediaConstraints sdpConstraints; private final MediaConstraints mediaConstraints;
private DataChannel magicDataChannel; private DataChannel magicDataChannel;
private final MagicSdpObserver magicSdpObserver; private final MagicSdpObserver magicSdpObserver;
private MediaStream remoteMediaStream; private MediaStream remoteMediaStream;
@ -92,7 +92,7 @@ public class MagicPeerConnectionWrapper {
public MagicPeerConnectionWrapper(PeerConnectionFactory peerConnectionFactory, public MagicPeerConnectionWrapper(PeerConnectionFactory peerConnectionFactory,
List<PeerConnection.IceServer> iceServerList, List<PeerConnection.IceServer> iceServerList,
MediaConstraints sdpConstraints, MediaConstraints mediaConstraints,
String sessionId, String localSession, @Nullable MediaStream localStream, String sessionId, String localSession, @Nullable MediaStream localStream,
boolean isMCUPublisher, boolean hasMCU, String videoStreamType) { boolean isMCUPublisher, boolean hasMCU, String videoStreamType) {
@ -102,7 +102,7 @@ public class MagicPeerConnectionWrapper {
this.videoStreamType = videoStreamType; this.videoStreamType = videoStreamType;
this.sessionId = sessionId; this.sessionId = sessionId;
this.sdpConstraints = sdpConstraints; this.mediaConstraints = mediaConstraints;
magicSdpObserver = new MagicSdpObserver(); magicSdpObserver = new MagicSdpObserver();
hasInitiated = sessionId.compareTo(localSession) < 0; hasInitiated = sessionId.compareTo(localSession) < 0;
@ -129,7 +129,7 @@ public class MagicPeerConnectionWrapper {
magicDataChannel = peerConnection.createDataChannel("status", init); magicDataChannel = peerConnection.createDataChannel("status", init);
magicDataChannel.registerObserver(new MagicDataChannelObserver()); magicDataChannel.registerObserver(new MagicDataChannelObserver());
if (isMCUPublisher) { if (isMCUPublisher) {
peerConnection.createOffer(magicSdpObserver, sdpConstraints); peerConnection.createOffer(magicSdpObserver, mediaConstraints);
} else if (hasMCU && this.videoStreamType.equals("video")) { } else if (hasMCU && this.videoStreamType.equals("video")) {
// If the connection type is "screen" the client sharing the screen will send an // If the connection type is "screen" the client sharing the screen will send an
// offer; offers should be requested only for videos. // offer; offers should be requested only for videos.
@ -137,7 +137,7 @@ public class MagicPeerConnectionWrapper {
hashMap.put("sessionId", sessionId); hashMap.put("sessionId", sessionId);
EventBus.getDefault().post(new WebSocketCommunicationEvent("peerReadyForRequestingOffer", hashMap)); EventBus.getDefault().post(new WebSocketCommunicationEvent("peerReadyForRequestingOffer", hashMap));
} else if (!hasMCU && hasInitiated) { } else if (!hasMCU && hasInitiated) {
peerConnection.createOffer(magicSdpObserver, sdpConstraints); peerConnection.createOffer(magicSdpObserver, mediaConstraints);
} }
} }
} }
@ -449,7 +449,7 @@ public class MagicPeerConnectionWrapper {
public void onSetSuccess() { public void onSetSuccess() {
if (peerConnection != null) { if (peerConnection != null) {
if (peerConnection.getLocalDescription() == null) { if (peerConnection.getLocalDescription() == null) {
peerConnection.createAnswer(magicSdpObserver, sdpConstraints); peerConnection.createAnswer(magicSdpObserver, mediaConstraints);
} }
if (peerConnection.getRemoteDescription() != null) { if (peerConnection.getRemoteDescription() != null) {