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

Capture HD video at 30FPS

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-21 22:56:49 +01:00
parent dfdf479ca3
commit 7a784db57d
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -32,7 +32,6 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@ -40,7 +39,6 @@ import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.util.TypedValue;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
@ -176,7 +174,6 @@ public class CallActivity extends AppCompatActivity {
private String roomToken; private String roomToken;
private UserEntity userEntity; private UserEntity userEntity;
private String callSession; private String callSession;
private VideoCapturer videoCapturerAndroid;
private MediaStream localMediaStream; private MediaStream localMediaStream;
private String credentials; private String credentials;
private List<MagicPeerConnectionWrapper> magicPeerConnectionWrapperList = new ArrayList<>(); private List<MagicPeerConnectionWrapper> magicPeerConnectionWrapperList = new ArrayList<>();
@ -299,11 +296,6 @@ public class CallActivity extends AppCompatActivity {
} }
} }
private VideoCapturer createVideoCapturer() {
videoCapturer = createCameraCapturer(cameraEnumerator);
return videoCapturer;
}
private VideoCapturer createCameraCapturer(CameraEnumerator enumerator) { private VideoCapturer createCameraCapturer(CameraEnumerator enumerator) {
final String[] deviceNames = enumerator.getDeviceNames(); final String[] deviceNames = enumerator.getDeviceNames();
@ -387,15 +379,14 @@ public class CallActivity extends AppCompatActivity {
PeerConnectionFactory.Options options = new PeerConnectionFactory.Options(); PeerConnectionFactory.Options options = new PeerConnectionFactory.Options();
peerConnectionFactory = new PeerConnectionFactory(options); peerConnectionFactory = new PeerConnectionFactory(options);
//Now create a VideoCapturer instance. Callback methods are there if you want to do something! Duh! videoCapturer = createCameraCapturer(cameraEnumerator);
videoCapturerAndroid = createVideoCapturer();
//Create MediaConstraints - Will be useful for specifying video and audio constraints. //Create MediaConstraints - Will be useful for specifying video and audio constraints.
audioConstraints = new MediaConstraints(); audioConstraints = new MediaConstraints();
videoConstraints = new MediaConstraints(); videoConstraints = new MediaConstraints();
//Create a VideoSource instance //Create a VideoSource instance
videoSource = peerConnectionFactory.createVideoSource(videoCapturerAndroid); videoSource = peerConnectionFactory.createVideoSource(videoCapturer);
localVideoTrack = peerConnectionFactory.createVideoTrack("NCv0", videoSource); localVideoTrack = peerConnectionFactory.createVideoTrack("NCv0", videoSource);
//create an AudioSource instance //create an AudioSource instance
@ -516,9 +507,7 @@ public class CallActivity extends AppCompatActivity {
private void startVideoCapture() { private void startVideoCapture() {
if (videoCapturer != null) { if (videoCapturer != null) {
Resources r = getResources(); videoCapturer.startCapture(1280, 720, 30);
int px = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 120, r.getDisplayMetrics());
videoCapturerAndroid.startCapture(px, px, 30);
} }
} }