From d1d96b2508f2226c61b100504657e28a8bbbc5d5 Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Mon, 2 May 2016 09:43:19 +0200 Subject: [PATCH] VideoCapturerAndroid: Remove deprecated create function with egl context argument R=glaznev@webrtc.org, perkj@webrtc.org Review URL: https://codereview.webrtc.org/1900413002 . Cr-Commit-Position: refs/heads/master@{#12587} --- .../src/org/webrtc/VideoCapturerAndroidTest.java | 9 --------- .../java/android/org/webrtc/VideoCapturerAndroid.java | 6 ------ .../src/org/appspot/apprtc/PeerConnectionClient.java | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java b/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java index 11b6366ac2..7c9872d25f 100644 --- a/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java +++ b/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java @@ -88,15 +88,6 @@ public class VideoCapturerAndroidTest extends ActivityTestCase { VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer); } - @SmallTest - public void testStartVideoCapturerUsingTexturesDeprecated() throws InterruptedException { - EglBase eglBase = EglBase.create(); - VideoCapturerAndroid capturer = - VideoCapturerAndroid.create("", null, eglBase.getEglBaseContext()); - VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer); - eglBase.release(); - } - @SmallTest public void testStartVideoCapturerUsingTextures() throws InterruptedException { VideoCapturerAndroid capturer = diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java index 93e623e4bd..e4f2449cb9 100644 --- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java +++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java @@ -187,12 +187,6 @@ public class VideoCapturerAndroid implements return VideoCapturerAndroid.create(name, eventsHandler, false /* captureToTexture */); } - // Deprecated. Use create() function below instead. - public static VideoCapturerAndroid create(String name, - CameraEventsHandler eventsHandler, EglBase.Context sharedEglContext) { - return create(name, eventsHandler, (sharedEglContext != null) /* captureToTexture */); - } - public static VideoCapturerAndroid create(String name, CameraEventsHandler eventsHandler, boolean captureToTexture) { final int cameraId = lookupDeviceName(name); diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java index 4ac7e0508b..8f30451183 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java @@ -488,7 +488,7 @@ public class PeerConnectionClient { } Log.d(TAG, "Opening camera: " + cameraDeviceName); videoCapturer = VideoCapturerAndroid.create(cameraDeviceName, null, - peerConnectionParameters.captureToTexture ? renderEGLContext : null); + peerConnectionParameters.captureToTexture); if (videoCapturer == null) { reportError("Failed to open camera"); return;