Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / examples / android / src / org / appspot / apprtc / AppRTCClient.java

diff --git a/src/third_party/libjingle/source/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java b/src/third_party/libjingle/source/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java
index fc34777..86460bc 100644 (file)
--- a/src/third_party/libjingle/source/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java
+++ b/src/third_party/libjingle/source/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java
@@ -273,6 +273,7 @@ public class AppRTCClient {
 
       MediaConstraints pcConstraints = constraintsFromJSON(
           getVarValue(roomHtml, "pcConstraints", false));
+      addDTLSConstraintIfMissing(pcConstraints);
       Log.d(TAG, "pcConstraints: " + pcConstraints);
       MediaConstraints videoConstraints = constraintsFromJSON(
           getAVConstraints("video",
@@ -288,6 +289,26 @@ public class AppRTCClient {
           pcConstraints, videoConstraints, audioConstraints);
     }
 
+    // Mimic Chrome and set DtlsSrtpKeyAgreement to true if not set to false by
+    // the web-app.
+    private void addDTLSConstraintIfMissing(
+        MediaConstraints pcConstraints) {
+      for (MediaConstraints.KeyValuePair pair : pcConstraints.mandatory) {
+        if (pair.getKey().equals("DtlsSrtpKeyAgreement")) {
+          return;
+        }
+      }
+      for (MediaConstraints.KeyValuePair pair : pcConstraints.optional) {
+        if (pair.getKey().equals("DtlsSrtpKeyAgreement")) {
+          return;
+        }
+      }
+      // DTLS isn't being suppressed (e.g. for debug=loopback calls), so enable
+      // it by default.
+      pcConstraints.optional.add(
+          new MediaConstraints.KeyValuePair("DtlsSrtpKeyAgreement", "true"));
+    }
+
     // Return the constraints specified for |type| of "audio" or "video" in
     // |mediaConstraintsString|.
     private String getAVConstraints(