Update Android native API example to use real camera.
For simplicity, camera with index 0 is used. User also has to manually give the permission to use the camera for the app. Bug: webrtc:8769 Change-Id: I371f26f94d629411fd299671b4f3202e84556b80 Reviewed-on: https://webrtc-review.googlesource.com/76982 Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Paulina Hensman <phensman@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23284}
This commit is contained in:
committed by
Commit Bot
parent
09133af36f
commit
c475ac14a9
@ -10,28 +10,46 @@
|
||||
|
||||
package org.webrtc.examples.androidnativeapi;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Handler;
|
||||
import android.os.HandlerThread;
|
||||
import org.webrtc.JNINamespace;
|
||||
import org.webrtc.NativeClassQualifiedName;
|
||||
import org.webrtc.SurfaceTextureHelper;
|
||||
import org.webrtc.VideoCapturer;
|
||||
import org.webrtc.VideoSink;
|
||||
|
||||
@JNINamespace("webrtc_examples")
|
||||
public class CallClient {
|
||||
private static final String TAG = "CallClient";
|
||||
private static final int CAPTURE_WIDTH = 640;
|
||||
private static final int CAPTURE_HEIGHT = 480;
|
||||
private static final int CAPTURE_FPS = 30;
|
||||
|
||||
private final Context applicationContext;
|
||||
private final HandlerThread thread;
|
||||
private final Handler handler;
|
||||
|
||||
private long nativeClient;
|
||||
private SurfaceTextureHelper surfaceTextureHelper;
|
||||
private VideoCapturer videoCapturer;
|
||||
|
||||
public CallClient() {
|
||||
public CallClient(Context applicationContext) {
|
||||
this.applicationContext = applicationContext;
|
||||
thread = new HandlerThread(TAG + "Thread");
|
||||
thread.start();
|
||||
handler = new Handler(thread.getLooper());
|
||||
handler.post(() -> { nativeClient = nativeCreateClient(); });
|
||||
}
|
||||
|
||||
public void call(VideoSink localSink, VideoSink remoteSink) {
|
||||
handler.post(() -> { nativeCall(nativeClient, localSink, remoteSink); });
|
||||
public void call(VideoSink localSink, VideoSink remoteSink, VideoCapturer videoCapturer,
|
||||
SurfaceTextureHelper videoCapturerSurfaceTextureHelper) {
|
||||
handler.post(() -> {
|
||||
nativeCall(nativeClient, localSink, remoteSink);
|
||||
videoCapturer.initialize(videoCapturerSurfaceTextureHelper, applicationContext,
|
||||
nativeGetJavaVideoCapturerObserver(nativeClient));
|
||||
videoCapturer.startCapture(CAPTURE_WIDTH, CAPTURE_HEIGHT, CAPTURE_FPS);
|
||||
});
|
||||
}
|
||||
|
||||
public void hangup() {
|
||||
@ -53,4 +71,7 @@ public class CallClient {
|
||||
private static native void nativeHangup(long nativePtr);
|
||||
@NativeClassQualifiedName("webrtc_examples::AndroidCallClient")
|
||||
private static native void nativeDelete(long nativePtr);
|
||||
@NativeClassQualifiedName("webrtc_examples::AndroidCallClient")
|
||||
private static native VideoCapturer.CapturerObserver nativeGetJavaVideoCapturerObserver(
|
||||
long nativePtr);
|
||||
}
|
||||
|
||||
@ -11,19 +11,27 @@
|
||||
package org.webrtc.examples.androidnativeapi;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.widget.Button;
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.Camera1Enumerator;
|
||||
import org.webrtc.Camera2Enumerator;
|
||||
import org.webrtc.CameraEnumerator;
|
||||
import org.webrtc.ContextUtils;
|
||||
import org.webrtc.EglBase;
|
||||
import org.webrtc.GlRectDrawer;
|
||||
import org.webrtc.SurfaceTextureHelper;
|
||||
import org.webrtc.SurfaceViewRenderer;
|
||||
import org.webrtc.VideoCapturer;
|
||||
|
||||
public class MainActivity extends Activity {
|
||||
private @Nullable CallClient callClient;
|
||||
private @Nullable EglBase eglBase;
|
||||
private @Nullable SurfaceViewRenderer localRenderer;
|
||||
private @Nullable SurfaceViewRenderer remoteRenderer;
|
||||
private @Nullable SurfaceTextureHelper videoCapturerSurfaceTextureHelper;
|
||||
private @Nullable VideoCapturer videoCapturer;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstance) {
|
||||
@ -33,13 +41,19 @@ public class MainActivity extends Activity {
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
System.loadLibrary("examples_androidnativeapi_jni");
|
||||
callClient = new CallClient();
|
||||
callClient = new CallClient(getApplicationContext());
|
||||
|
||||
Button callButton = (Button) findViewById(R.id.call_button);
|
||||
callButton.setOnClickListener((view) -> { callClient.call(localRenderer, remoteRenderer); });
|
||||
callButton.setOnClickListener((view) -> {
|
||||
if (videoCapturer == null) {
|
||||
videoCapturer = createVideoCapturer(getApplicationContext());
|
||||
}
|
||||
callClient.call(
|
||||
localRenderer, remoteRenderer, videoCapturer, videoCapturerSurfaceTextureHelper);
|
||||
});
|
||||
|
||||
Button hangupButton = (Button) findViewById(R.id.hangup_button);
|
||||
hangupButton.setOnClickListener((view) -> { callClient.hangup(); });
|
||||
hangupButton.setOnClickListener((view) -> { hangup(); });
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -54,18 +68,23 @@ public class MainActivity extends Activity {
|
||||
new GlRectDrawer());
|
||||
remoteRenderer.init(eglBase.getEglBaseContext(), null /* rendererEvents */,
|
||||
EglBase.CONFIG_PLAIN, new GlRectDrawer());
|
||||
|
||||
videoCapturerSurfaceTextureHelper =
|
||||
SurfaceTextureHelper.create("VideoCapturerThread", eglBase.getEglBaseContext());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStop() {
|
||||
callClient.hangup();
|
||||
hangup();
|
||||
|
||||
localRenderer.release();
|
||||
remoteRenderer.release();
|
||||
videoCapturerSurfaceTextureHelper.dispose();
|
||||
eglBase.release();
|
||||
|
||||
localRenderer = null;
|
||||
remoteRenderer = null;
|
||||
videoCapturerSurfaceTextureHelper = null;
|
||||
eglBase = null;
|
||||
|
||||
super.onStop();
|
||||
@ -78,4 +97,24 @@ public class MainActivity extends Activity {
|
||||
|
||||
super.onDestroy();
|
||||
}
|
||||
|
||||
private void hangup() {
|
||||
if (videoCapturer != null) {
|
||||
try {
|
||||
videoCapturer.stopCapture();
|
||||
} catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
videoCapturer.dispose();
|
||||
videoCapturer = null;
|
||||
}
|
||||
callClient.hangup();
|
||||
}
|
||||
|
||||
private static VideoCapturer createVideoCapturer(Context context) {
|
||||
CameraEnumerator enumerator = Camera2Enumerator.isSupported(context)
|
||||
? new Camera2Enumerator(context)
|
||||
: new Camera1Enumerator();
|
||||
return enumerator.createCapturer(enumerator.getDeviceNames()[0], null /* eventsHandler */);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user