From 84db3be5c899314fd5feb2af4690fdd8d9039874 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Wed, 20 Dec 2017 23:12:49 +0100 Subject: [PATCH] Use Camera2 where available Signed-off-by: Mario Danic --- .../nextcloud/talk/activities/CallActivity.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index d9e5fb0e6..e57bf7ee6 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -24,6 +24,7 @@ package com.nextcloud.talk.activities; +import android.Manifest; import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; @@ -72,6 +73,7 @@ import org.parceler.Parcels; import org.webrtc.AudioSource; import org.webrtc.AudioTrack; import org.webrtc.Camera1Enumerator; +import org.webrtc.Camera2Enumerator; import org.webrtc.CameraEnumerator; import org.webrtc.EglBase; import org.webrtc.IceCandidate; @@ -115,7 +117,8 @@ public class CallActivity extends AppCompatActivity { private static final String TAG = "CallActivity"; private static final String[] PERMISSIONS_CALL = { android.Manifest.permission.CAMERA, - android.Manifest.permission.RECORD_AUDIO + android.Manifest.permission.RECORD_AUDIO, + Manifest.permission.MODIFY_AUDIO_SETTINGS }; @BindView(R.id.pip_video_view) SurfaceViewRenderer pipVideoView; @@ -187,7 +190,15 @@ public class CallActivity extends AppCompatActivity { } private VideoCapturer createVideoCapturer() { - videoCapturer = createCameraCapturer(new Camera1Enumerator(false)); + CameraEnumerator cameraEnumerator; + + if (Camera2Enumerator.isSupported(this)) { + cameraEnumerator = new Camera2Enumerator(this); + } else { + cameraEnumerator = new Camera1Enumerator(false); + } + + videoCapturer = createCameraCapturer(cameraEnumerator); return videoCapturer; }