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

Revert of Made EglBase an abstract class and cleaned up. (patchset #4 id:60001 of https://codereview.webrtc.org/1526463002/ )

Browse Source 
Reason for revert:
Revert due breaking other clients.

Original issue's description:
> Made EglBase an abstract class and cleaned up.
> Adds EglBase10 that implemenents EglBase for EGL 1.0
>
> BUG=webrtc:4993
> TBR=glaznew@webrtc.org
>
> Committed: https://crrev.com/3207916f35ded33f586774e2c98d4d0089fe3c6e
> Cr-Commit-Position: refs/heads/master@{#11011}

TBR=magjed@webrtc.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4993

Review URL: https://codereview.webrtc.org/1522073002

Cr-Commit-Position: refs/heads/master@{#11013}
This commit is contained in:
perkj
2015-12-14 06:43:35 -08:00
committed by Commit bot
parent 40f349fdda
commit e22e1cb399
10 changed files with 319 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
View File

@ -181,9 +181,9 @@ public class CallActivity extends Activity
remoteRender.setOnClickListener(listener);
// Create video renderers.
rootEglBase = EglBase.create();
localRender.init(rootEglBase.getEglBaseContext(), null);
remoteRender.init(rootEglBase.getEglBaseContext(), null);
rootEglBase = new EglBase();
localRender.init(rootEglBase.getContext(), null);
remoteRender.init(rootEglBase.getContext(), null);
localRender.setZOrderMediaOverlay(true);
updateVideoView();
@ -254,7 +254,6 @@ public class CallActivity extends Activity
// For command line execution run connection for <runTimeMs> and exit.
if (commandLineRun && runTimeMs > 0) {
(new Handler()).postDelayed(new Runnable() {
@Override
public void run() {
disconnect();
}
@ -489,7 +488,7 @@ public class CallActivity extends Activity
signalingParameters = params;
logAndToast("Creating peer connection, delay=" + delta + "ms");
peerConnectionClient.createPeerConnection(rootEglBase.getEglBaseContext(),
peerConnectionClient.createPeerConnection(rootEglBase.getContext(),
localRender, remoteRender, signalingParameters);
if (signalingParameters.initiator) {

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

@ -47,6 +47,8 @@ import java.util.TimerTask;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.microedition.khronos.egl.EGLContext;
/**
* Peer connection client implementation.
*
@ -257,7 +259,7 @@ public class PeerConnectionClient {
}
public void createPeerConnection(
final EglBase.Context renderEGLContext,
final EGLContext renderEGLContext,
final VideoRenderer.Callbacks localRender,
final VideoRenderer.Callbacks remoteRender,
final SignalingParameters signalingParameters) {
@ -427,7 +429,7 @@ public class PeerConnectionClient {
}
}
private void createPeerConnectionInternal(EglBase.Context renderEGLContext) {
private void createPeerConnectionInternal(EGLContext renderEGLContext) {
if (factory == null || isError) {
Log.e(TAG, "Peerconnection factory is not created");
return;
@ -476,7 +478,7 @@ public class PeerConnectionClient {
}
Log.d(TAG, "Opening camera: " + cameraDeviceName);
videoCapturer = VideoCapturerAndroid.create(cameraDeviceName, null,
peerConnectionParameters.captureToTexture ? renderEGLContext : null);
peerConnectionParameters.captureToTexture ? new EglBase.Context(renderEGLContext) : null);
if (videoCapturer == null) {
reportError("Failed to open camera");
return;