neoris/openvidu-livekit-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #100 from rfazi/fix-stream. Fixes #99

Browse Source 
Testing your PR and seeing the Android Studio Profiler tool,  I've noticed a slight decrease of the CPU usage (around 5%) and use of smartphone energy and slight decrease of the Network usage.
I've create a room between Android-Chrome , and Android-Firefox and everything seems to be working fine.
This commit is contained in:
Carlos Santos 2020-05-15 13:07:16 +02:00 committed by csantosm
commit 9492d2c29c
2 changed files with 68 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Session.java
View File

@ -14,6 +14,8 @@ import org.webrtc.MediaConstraints;
import org.webrtc.MediaStream;
import org.webrtc.PeerConnection;
import org.webrtc.PeerConnectionFactory;
import org.webrtc.RtpReceiver;
import org.webrtc.RtpTransceiver;
import org.webrtc.SessionDescription;
import org.webrtc.SoftwareVideoDecoderFactory;
import org.webrtc.SoftwareVideoEncoderFactory;
@ -70,7 +72,16 @@ public class Session {
PeerConnection.IceServer iceServer = PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer();
iceServers.add(iceServer);
PeerConnection peerConnection = peerConnectionFactory.createPeerConnection(iceServers, new CustomPeerConnectionObserver("local") {
PeerConnection.RTCConfiguration rtcConfig = new PeerConnection.RTCConfiguration(iceServers);
rtcConfig.tcpCandidatePolicy = PeerConnection.TcpCandidatePolicy.ENABLED;
rtcConfig.bundlePolicy = PeerConnection.BundlePolicy.MAXBUNDLE;
rtcConfig.rtcpMuxPolicy = PeerConnection.RtcpMuxPolicy.NEGOTIATE;
rtcConfig.continualGatheringPolicy = PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY;
rtcConfig.keyType = PeerConnection.KeyType.ECDSA;
rtcConfig.enableDtlsSrtp = true;
rtcConfig.sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN;
PeerConnection peerConnection = peerConnectionFactory.createPeerConnection(rtcConfig, new CustomPeerConnectionObserver("local") {
@Override
public void onIceCandidate(IceCandidate iceCandidate) {
super.onIceCandidate(iceCandidate);
@ -86,7 +97,16 @@ public class Session {
PeerConnection.IceServer iceServer = PeerConnection.IceServer.builder("stun:stun.l.google.com:19302").createIceServer();
iceServers.add(iceServer);
PeerConnection peerConnection = peerConnectionFactory.createPeerConnection(iceServers, new CustomPeerConnectionObserver("remotePeerCreation") {
PeerConnection.RTCConfiguration rtcConfig = new PeerConnection.RTCConfiguration(iceServers);
rtcConfig.tcpCandidatePolicy = PeerConnection.TcpCandidatePolicy.ENABLED;
rtcConfig.bundlePolicy = PeerConnection.BundlePolicy.MAXBUNDLE;
rtcConfig.rtcpMuxPolicy = PeerConnection.RtcpMuxPolicy.NEGOTIATE;
rtcConfig.continualGatheringPolicy = PeerConnection.ContinualGatheringPolicy.GATHER_CONTINUALLY;
rtcConfig.keyType = PeerConnection.KeyType.ECDSA;
rtcConfig.enableDtlsSrtp = true;
rtcConfig.sdpSemantics = PeerConnection.SdpSemantics.UNIFIED_PLAN;
PeerConnection peerConnection = peerConnectionFactory.createPeerConnection(rtcConfig, new CustomPeerConnectionObserver("remotePeerCreation") {
@Override
public void onIceCandidate(IceCandidate iceCandidate) {
super.onIceCandidate(iceCandidate);
@ -94,9 +114,9 @@ public class Session {
}
@Override
public void onAddStream(MediaStream mediaStream) {
super.onAddStream(mediaStream);
activity.setRemoteMediaStream(mediaStream, remoteParticipants.get(connectionId));
public void onAddTrack(RtpReceiver rtpReceiver, MediaStream[] mediaStreams) {
super.onAddTrack(rtpReceiver, mediaStreams);
activity.setRemoteMediaStream(mediaStreams[0], remoteParticipants.get(connectionId));
}
@Override
@ -113,10 +133,13 @@ public class Session {
}
});
MediaStream mediaStream = peerConnectionFactory.createLocalMediaStream("105");
mediaStream.addTrack(localParticipant.getAudioTrack());
mediaStream.addTrack(localParticipant.getVideoTrack());
peerConnection.addStream(mediaStream);
peerConnection.addTrack(localParticipant.getAudioTrack());//Add audio track to create transReceiver
peerConnection.addTrack(localParticipant.getVideoTrack());//Add video track to create transReceiver
for (RtpTransceiver transceiver : peerConnection.getTransceivers()) {
//We set both audio and video in receive only mode
transceiver.setDirection(RtpTransceiver.RtpTransceiverDirection.RECV_ONLY);
}
this.remoteParticipants.get(connectionId).setPeerConnection(peerConnection);
}

55
openvidu-android/app/src/main/java/io/openvidu/openvidu_android/websocket/CustomWebSocket.java
View File

@ -5,13 +5,6 @@ import android.os.Handler;
import android.util.Log;
import android.widget.Toast;
import io.openvidu.openvidu_android.activities.SessionActivity;
import io.openvidu.openvidu_android.constants.JsonConstants;
import io.openvidu.openvidu_android.observers.CustomSdpObserver;
import io.openvidu.openvidu_android.openvidu.LocalParticipant;
import io.openvidu.openvidu_android.openvidu.Participant;
import io.openvidu.openvidu_android.openvidu.RemoteParticipant;
import io.openvidu.openvidu_android.openvidu.Session;
import com.neovisionaries.ws.client.ThreadType;
import com.neovisionaries.ws.client.WebSocket;
import com.neovisionaries.ws.client.WebSocketException;
@ -27,6 +20,7 @@ import org.webrtc.IceCandidate;
import org.webrtc.MediaConstraints;
import org.webrtc.MediaStream;
import org.webrtc.PeerConnection;
import org.webrtc.RtpTransceiver;
import org.webrtc.SessionDescription;
import java.io.IOException;
@ -51,6 +45,14 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import io.openvidu.openvidu_android.activities.SessionActivity;
import io.openvidu.openvidu_android.constants.JsonConstants;
import io.openvidu.openvidu_android.observers.CustomSdpObserver;
import io.openvidu.openvidu_android.openvidu.LocalParticipant;
import io.openvidu.openvidu_android.openvidu.Participant;
import io.openvidu.openvidu_android.openvidu.RemoteParticipant;
import io.openvidu.openvidu_android.openvidu.Session;
public class CustomWebSocket extends AsyncTask<SessionActivity, Void, Void> implements WebSocketListener {
private final String TAG = "CustomWebSocketListener";
@ -119,12 +121,15 @@ public class CustomWebSocket extends AsyncTask<SessionActivity, Void, Void> impl
localParticipant.setConnectionId(localConnectionId);
PeerConnection localPeerConnection = session.createLocalPeerConnection();
localParticipant.setPeerConnection(localPeerConnection);
MediaStream stream = this.session.getPeerConnectionFactory().createLocalMediaStream("102");
stream.addTrack(localParticipant.getAudioTrack());
stream.addTrack(localParticipant.getVideoTrack());
localParticipant.getPeerConnection().addStream(stream);
localPeerConnection.addTrack(localParticipant.getAudioTrack());
localPeerConnection.addTrack(localParticipant.getVideoTrack());
for (RtpTransceiver transceiver : localPeerConnection.getTransceivers()) {
transceiver.setDirection(RtpTransceiver.RtpTransceiverDirection.SEND_ONLY);
}
localParticipant.setPeerConnection(localPeerConnection);
MediaConstraints sdpConstraints = new MediaConstraints();
sdpConstraints.mandatory.add(new MediaConstraints.KeyValuePair("offerToReceiveAudio", "true"));
@ -262,11 +267,17 @@ public class CustomWebSocket extends AsyncTask<SessionActivity, Void, Void> impl
for (int i = 0; i < result.getJSONArray(JsonConstants.VALUE).length(); i++) {
JSONObject participantJson = result.getJSONArray(JsonConstants.VALUE).getJSONObject(i);
RemoteParticipant remoteParticipant = this.newRemoteParticipantAux(participantJson);
JSONArray streams = participantJson.getJSONArray("streams");
for (int j = 0; j < streams.length(); j++) {
JSONObject stream = streams.getJSONObject(0);
String streamId = stream.getString("id");
this.subscribeAux(remoteParticipant, streamId);
try {
JSONArray streams = participantJson.getJSONArray("streams");
for (int j = 0; j < streams.length(); j++) {
JSONObject stream = streams.getJSONObject(0);
String streamId = stream.getString("id");
this.subscribeAux(remoteParticipant, streamId);
}
} catch (Exception e) {
//Sometimes when we enter in room the other participants have no stream
//We catch that in this way the iteration of participants doesn't stop
Log.e(TAG, "Error in addRemoteParticipantsAlreadyInRoom: " + e.getLocalizedMessage());
}
}
}
@ -336,6 +347,10 @@ public class CustomWebSocket extends AsyncTask<SessionActivity, Void, Void> impl
}
private void subscribeAux(RemoteParticipant remoteParticipant, String streamId) {
MediaConstraints sdpConstraints = new MediaConstraints();
sdpConstraints.mandatory.add(new MediaConstraints.KeyValuePair("offerToReceiveAudio", "true"));
sdpConstraints.mandatory.add(new MediaConstraints.KeyValuePair("offerToReceiveVideo", "true"));
remoteParticipant.getPeerConnection().createOffer(new CustomSdpObserver("remote offer sdp") {
@Override
public void onCreateSuccess(SessionDescription sessionDescription) {
@ -348,7 +363,7 @@ public class CustomWebSocket extends AsyncTask<SessionActivity, Void, Void> impl
public void onCreateFailure(String s) {
Log.e("createOffer error", s);
}
}, new MediaConstraints());
}, sdpConstraints);
}
public void setWebsocketCancelled(boolean websocketCancelled) {
@ -530,7 +545,9 @@ public class CustomWebSocket extends AsyncTask<SessionActivity, Void, Void> impl
private String getWebSocketAddress(String openviduUrl) {
try {
URL url = new URL(openviduUrl);
return "wss://" + url.getHost() + ":" + url.getPort() + "/openvidu";
if (url.getPort() > -1)
return "wss://" + url.getHost() + ":" + url.getPort() + "/openvidu";
return "wss://" + url.getHost() + "/openvidu";
} catch (MalformedURLException e) {
Log.e(TAG, "Wrong URL", e);
e.printStackTrace();