| Index: talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
|
| diff --git a/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java b/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
|
| index 952bd083959f98488388964d77e53cc0c480d288..1f53f34ce26361a8a192896da8d2172c4c27fa7c 100644
|
| --- a/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
|
| +++ b/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
|
| @@ -51,9 +51,6 @@ import java.util.Set;
|
| import java.util.concurrent.CountDownLatch;
|
| import java.util.concurrent.TimeUnit;
|
|
|
| -import javax.microedition.khronos.egl.EGLContext;
|
| -import javax.microedition.khronos.egl.EGL10;
|
| -
|
| // Android specific implementation of VideoCapturer.
|
| // An instance of this class can be created by an application using
|
| // VideoCapturerAndroid.create();
|
| @@ -233,7 +230,7 @@ public class VideoCapturerAndroid extends VideoCapturer implements
|
| }
|
|
|
| public static VideoCapturerAndroid create(String name,
|
| - CameraEventsHandler eventsHandler, EGLContext sharedEglContext) {
|
| + CameraEventsHandler eventsHandler, EglBase.Context sharedEglContext) {
|
| final int cameraId = lookupDeviceName(name);
|
| if (cameraId == -1) {
|
| return null;
|
| @@ -349,7 +346,7 @@ public class VideoCapturerAndroid extends VideoCapturer implements
|
| }
|
|
|
| private VideoCapturerAndroid(int cameraId, CameraEventsHandler eventsHandler,
|
| - EGLContext sharedContext) {
|
| + EglBase.Context sharedContext) {
|
| Logging.d(TAG, "VideoCapturerAndroid");
|
| this.id = cameraId;
|
| this.eventsHandler = eventsHandler;
|
| @@ -360,8 +357,7 @@ public class VideoCapturerAndroid extends VideoCapturer implements
|
| isCapturingToTexture = (sharedContext != null);
|
| cameraStatistics =
|
| new CameraStatistics(isCapturingToTexture ? 1 : videoBuffers.numCaptureBuffers);
|
| - surfaceHelper = SurfaceTextureHelper.create(
|
| - isCapturingToTexture ? sharedContext : EGL10.EGL_NO_CONTEXT, cameraThreadHandler);
|
| + surfaceHelper = SurfaceTextureHelper.create(sharedContext, cameraThreadHandler);
|
| if (isCapturingToTexture) {
|
| surfaceHelper.setListener(this);
|
| }
|
|
|