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}
This commit is contained in:
@ -88,15 +88,6 @@ public class VideoCapturerAndroidTest extends ActivityTestCase {
|
|||||||
VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer);
|
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
|
@SmallTest
|
||||||
public void testStartVideoCapturerUsingTextures() throws InterruptedException {
|
public void testStartVideoCapturerUsingTextures() throws InterruptedException {
|
||||||
VideoCapturerAndroid capturer =
|
VideoCapturerAndroid capturer =
|
||||||
|
|||||||
@ -187,12 +187,6 @@ public class VideoCapturerAndroid implements
|
|||||||
return VideoCapturerAndroid.create(name, eventsHandler, false /* captureToTexture */);
|
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,
|
public static VideoCapturerAndroid create(String name,
|
||||||
CameraEventsHandler eventsHandler, boolean captureToTexture) {
|
CameraEventsHandler eventsHandler, boolean captureToTexture) {
|
||||||
final int cameraId = lookupDeviceName(name);
|
final int cameraId = lookupDeviceName(name);
|
||||||
|
|||||||
@ -488,7 +488,7 @@ public class PeerConnectionClient {
|
|||||||
}
|
}
|
||||||
Log.d(TAG, "Opening camera: " + cameraDeviceName);
|
Log.d(TAG, "Opening camera: " + cameraDeviceName);
|
||||||
videoCapturer = VideoCapturerAndroid.create(cameraDeviceName, null,
|
videoCapturer = VideoCapturerAndroid.create(cameraDeviceName, null,
|
||||||
peerConnectionParameters.captureToTexture ? renderEGLContext : null);
|
peerConnectionParameters.captureToTexture);
|
||||||
if (videoCapturer == null) {
|
if (videoCapturer == null) {
|
||||||
reportError("Failed to open camera");
|
reportError("Failed to open camera");
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user