Chromium Code Reviews| Index: webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java |
| diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java |
| index 48a771632ab7132b6d7c19ba7d154a5ae898bcff..16c821739522335eefe121b0e0d757ab0d5d6c76 100644 |
| --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java |
| +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java |
| @@ -13,6 +13,8 @@ package org.appspot.apprtc; |
| import org.appspot.apprtc.AppRTCClient.RoomConnectionParameters; |
| import org.appspot.apprtc.AppRTCClient.SignalingParameters; |
| import org.appspot.apprtc.PeerConnectionClient.PeerConnectionParameters; |
| +import org.appspot.apprtc.PeerConnectionClient.DataChannelParameters; |
| +import org.appspot.apprtc.util.LooperExecutor; |
|
sakal
2016/11/09 11:45:03
Why did you add this?
hekra01
2016/11/10 02:32:20
DatChannelParams for what is set in settings
Loope
|
| import android.app.Activity; |
| import android.app.AlertDialog; |
| @@ -93,6 +95,21 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven |
| "org.appspot.apprtc.SAVE_REMOTE_VIDEO_TO_FILE_HEIGHT"; |
| public static final String EXTRA_USE_VALUES_FROM_INTENT = |
| "org.appspot.apprtc.USE_VALUES_FROM_INTENT"; |
| + public static final String EXTRA_DATA_CHANNEL_ENABLED = |
| + "org.appspot.apprtc.DATA_CHANNEL_ENABLED"; |
| + public static final String EXTRA_ORDERED = |
| + "org.appspot.apprtc.ORDERED"; |
| + public static final String EXTRA_MAX_RETRANSMITS_MS = |
| + "org.appspot.apprtc.MAX_RETRANSMITS_MS"; |
| + public static final String EXTRA_MAX_RETRANSMITS = |
| + "org.appspot.apprtc.MAX_RETRANSMITS"; |
| + public static final String EXTRA_PROTOCOL = |
| + "org.appspot.apprtc.PROTOCOL"; |
| + public static final String EXTRA_NEGOTIATED = |
| + "org.appspot.apprtc.NEGOTIATED"; |
| + public static final String EXTRA_ID = |
| + "org.appspot.apprtc.ID"; |
| + |
| private static final String TAG = "CallRTCClient"; |
| // List of mandatory application permissions. |
| @@ -242,7 +259,16 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven |
| boolean loopback = intent.getBooleanExtra(EXTRA_LOOPBACK, false); |
| boolean tracing = intent.getBooleanExtra(EXTRA_TRACING, false); |
| - |
| + DataChannelParameters dataChannelParameters = null; |
| + if (intent.getBooleanExtra(EXTRA_DATA_CHANNEL_ENABLED, true)) { |
| + dataChannelParameters = new DataChannelParameters( |
| + intent.getBooleanExtra(EXTRA_ORDERED, true), |
| + intent.getIntExtra(EXTRA_MAX_RETRANSMITS_MS, -1), |
| + intent.getIntExtra(EXTRA_MAX_RETRANSMITS, -1), |
| + intent.getStringExtra(EXTRA_PROTOCOL), |
| + intent.getBooleanExtra(EXTRA_NEGOTIATED, false), |
| + intent.getIntExtra(EXTRA_ID, -1)); |
| + } |
| peerConnectionParameters = |
| new PeerConnectionParameters(intent.getBooleanExtra(EXTRA_VIDEO_CALL, true), loopback, |
| tracing, intent.getIntExtra(EXTRA_VIDEO_WIDTH, 0), |
| @@ -256,7 +282,7 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven |
| intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_AEC, false), |
| intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_AGC, false), |
| intent.getBooleanExtra(EXTRA_DISABLE_BUILT_IN_NS, false), |
| - intent.getBooleanExtra(EXTRA_ENABLE_LEVEL_CONTROL, false)); |
| + intent.getBooleanExtra(EXTRA_ENABLE_LEVEL_CONTROL, false), dataChannelParameters); |
| commandLineRun = intent.getBooleanExtra(EXTRA_CMDLINE, false); |
| runTimeMs = intent.getIntExtra(EXTRA_RUNTIME, 0); |