zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VideoCapturerAndroid: Remove deprecated create function with egl context argument

Browse Source 
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:
Magnus Jedvert
2016-05-02 09:43:19 +02:00
parent 1ba8d39a9c
commit d1d96b2508
3 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
View File

@ -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 =

6
webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
View File

@ -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);

2
webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
View File

@ -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;