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

openvidu-android: minor refactoring

Browse Source
This commit is contained in:
pabloFuente 2019-09-16 14:28:40 +02:00
parent 1439f20bce
commit 7e685c38fb
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openvidu-android/app/src/main/java/com/example/openviduandroid/activities/SessionActivity.java
View File

@ -282,15 +282,9 @@ public class SessionActivity extends AppCompatActivity {
public void setRemoteMediaStream(MediaStream stream, final RemoteParticipant remoteParticipant) {
final VideoTrack videoTrack = stream.videoTracks.get(0);
videoTrack.addSink(remoteParticipant.getVideoView());
runOnUiThread(() -> {
remoteParticipant.getVideoView().setVisibility(View.VISIBLE);
videoTrack.addSink(remoteParticipant.getVideoView());
MediaStream mediaStream = session.getPeerConnectionFactory().createLocalMediaStream("105");
remoteParticipant.setMediaStream(mediaStream);
mediaStream.addTrack(session.getLocalParticipant().getAudioTrack());
mediaStream.addTrack(session.getLocalParticipant().getVideoTrack());
remoteParticipant.getPeerConnection().removeStream(mediaStream);
remoteParticipant.getPeerConnection().addStream(mediaStream);
});
}

10
openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/LocalParticipant.java
View File

@ -1,9 +1,12 @@
package com.example.openviduandroid.openvidu;
import android.content.Context;
import android.os.Build;
import org.webrtc.AudioSource;
import org.webrtc.Camera1Enumerator;
import org.webrtc.Camera2Enumerator;
import org.webrtc.CameraEnumerator;
import org.webrtc.EglBase;
import org.webrtc.IceCandidate;
import org.webrtc.MediaConstraints;
@ -60,7 +63,12 @@ public class LocalParticipant extends Participant {
}
private VideoCapturer createCameraCapturer() {
Camera1Enumerator enumerator = new Camera1Enumerator(false);
CameraEnumerator enumerator;
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
enumerator = new Camera2Enumerator(this.context);
} else {
enumerator = new Camera1Enumerator(false);
}
final String[] deviceNames = enumerator.getDeviceNames();
// Try to find front facing camera

2
openvidu-android/app/src/main/java/com/example/openviduandroid/openvidu/Participant.java
View File

@ -84,7 +84,7 @@ public abstract class Participant {
public void dispose() {
if (this.peerConnection != null) {
try {
this.peerConnection.dispose();
this.peerConnection.close();
} catch (IllegalStateException e) {
Log.e("Dispose PeerConnection", e.getMessage());
}