diff options
Diffstat (limited to 'webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java')
| -rw-r--r-- | webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java index 8ae7981e36..b9abf11eb3 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java @@ -22,7 +22,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; -import android.opengl.GLSurfaceView; import android.os.Bundle; import android.os.Handler; import android.util.Log; @@ -67,16 +66,21 @@ public class CallActivity extends Activity "org.appspot.apprtc.VIDEOCODEC"; public static final String EXTRA_HWCODEC_ENABLED = "org.appspot.apprtc.HWCODEC"; + public static final String EXTRA_CAPTURETOTEXTURE_ENABLED = + "org.appspot.apprtc.CAPTURETOTEXTURE"; public static final String EXTRA_AUDIO_BITRATE = "org.appspot.apprtc.AUDIO_BITRATE"; public static final String EXTRA_AUDIOCODEC = "org.appspot.apprtc.AUDIOCODEC"; public static final String EXTRA_NOAUDIOPROCESSING_ENABLED = "org.appspot.apprtc.NOAUDIOPROCESSING"; - public static final String EXTRA_CPUOVERUSE_DETECTION = - "org.appspot.apprtc.CPUOVERUSE_DETECTION"; + public static final String EXTRA_AECDUMP_ENABLED = + "org.appspot.apprtc.AECDUMP"; + public static final String EXTRA_OPENSLES_ENABLED = + "org.appspot.apprtc.OPENSLES"; public static final String EXTRA_DISPLAY_HUD = "org.appspot.apprtc.DISPLAY_HUD"; + public static final String EXTRA_TRACING = "org.appspot.apprtc.TRACING"; public static final String EXTRA_CMDLINE = "org.appspot.apprtc.CMDLINE"; public static final String EXTRA_RUNTIME = @@ -177,9 +181,9 @@ public class CallActivity extends Activity remoteRender.setOnClickListener(listener); // Create video renderers. - rootEglBase = new EglBase(); - localRender.init(rootEglBase.getContext(), null); - remoteRender.init(rootEglBase.getContext(), null); + rootEglBase = EglBase.create(); + localRender.init(rootEglBase.getEglBaseContext(), null); + remoteRender.init(rootEglBase.getEglBaseContext(), null); localRender.setZOrderMediaOverlay(true); updateVideoView(); @@ -212,19 +216,23 @@ public class CallActivity extends Activity return; } boolean loopback = intent.getBooleanExtra(EXTRA_LOOPBACK, false); + boolean tracing = intent.getBooleanExtra(EXTRA_TRACING, false); peerConnectionParameters = new PeerConnectionParameters( intent.getBooleanExtra(EXTRA_VIDEO_CALL, true), loopback, + tracing, intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0), intent.getIntExtra(EXTRA_VIDEO_HEIGHT, 0), intent.getIntExtra(EXTRA_VIDEO_FPS, 0), intent.getIntExtra(EXTRA_VIDEO_BITRATE, 0), intent.getStringExtra(EXTRA_VIDEOCODEC), intent.getBooleanExtra(EXTRA_HWCODEC_ENABLED, true), + intent.getBooleanExtra(EXTRA_CAPTURETOTEXTURE_ENABLED, false), intent.getIntExtra(EXTRA_AUDIO_BITRATE, 0), intent.getStringExtra(EXTRA_AUDIOCODEC), intent.getBooleanExtra(EXTRA_NOAUDIOPROCESSING_ENABLED, false), - intent.getBooleanExtra(EXTRA_CPUOVERUSE_DETECTION, true)); + intent.getBooleanExtra(EXTRA_AECDUMP_ENABLED, false), + intent.getBooleanExtra(EXTRA_OPENSLES_ENABLED, false)); commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); @@ -246,6 +254,7 @@ 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(); } @@ -480,7 +489,7 @@ public class CallActivity extends Activity signalingParameters = params; logAndToast("Creating peer connection, delay=" + delta + "ms"); - peerConnectionClient.createPeerConnection(rootEglBase.getContext(), + peerConnectionClient.createPeerConnection(rootEglBase.getEglBaseContext(), localRender, remoteRender, signalingParameters); if (signalingParameters.initiator) { |