Update WebRTC build: Release 71

New version is at commit d2362beb1744676b11942832c44c7925911b14ec https://chromium.googlesource.com/external/webrtc/+log/branch-heads/71
saltyrtc · Nov 5, 2018 · 943f009 · 943f009
1 parent cce25aa
commit 943f009
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -79,10 +79,8 @@ dependencies {
     }
     // The production code uses the SLF4J logging API at compile time
     implementation 'org.slf4j:slf4j-api:1.7.24'
-    // WebRTC RTCPeerConnection
-    implementation files('libs/base_java.jar')
-    implementation files('libs/audio_device_java.jar')
-    implementation files('libs/libjingle_peerconnection_java.jar')
+    // LibWebRTC
+    implementation files('libs/libwebrtc.jar')
     // Dependency: Msgpack serialization
     implementation 'org.msgpack:msgpack-core:0.8.12'
     implementation 'org.msgpack:jackson-dataformat-msgpack:0.8.12'

diff --git a/copy-webrtc.sh b/copy-webrtc.sh
@@ -5,10 +5,7 @@ DST=libs
 
 echo "Copying..."
 
-cp $SRC/base_java.jar $DST/
 cp $SRC/libwebrtc.jar $DST/
-cp $SRC/audio_device_java.jar $DST/
-cp $SRC/libjingle_peerconnection_java.jar $DST/
 cp $SRC/arm/libjingle_peerconnection_so.so $DST/armeabi-v7a/libjingle_peerconnection_so.so
 cp $SRC/x86/libjingle_peerconnection_so.so $DST/x86/libjingle_peerconnection_so.so
 

diff --git a/libs/armeabi-v7a/libjingle_peerconnection_so.so b/libs/armeabi-v7a/libjingle_peerconnection_so.so
diff --git a/libs/audio_device_java.jar b/libs/audio_device_java.jar
diff --git a/libs/base_java.jar b/libs/base_java.jar
diff --git a/libs/libjingle_peerconnection_java.jar b/libs/libjingle_peerconnection_java.jar
diff --git a/libs/libwebrtc.jar b/libs/libwebrtc.jar
diff --git a/libs/x86/libjingle_peerconnection_so.so b/libs/x86/libjingle_peerconnection_so.so
diff --git a/src/androidTest/java/org/saltyrtc/tasks/webrtc/Config.java b/src/androidTest/java/org/saltyrtc/tasks/webrtc/Config.java
@@ -12,8 +12,8 @@
  * Test configuration.
  */
 public class Config {
-    public static String SALTYRTC_HOST = "10.0.2.2";
-    public static int SALTYRTC_PORT = 8765;
+    public static String SALTYRTC_HOST = "server.saltyrtc.org";
+    public static int SALTYRTC_PORT = 9287;
     // Show debug output
     public static boolean DEBUG = true;
     // Show verbose output, e.g. websocket frames

diff --git a/src/androidTest/java/org/saltyrtc/tasks/webrtc/integration/ConnectionTest.java b/src/androidTest/java/org/saltyrtc/tasks/webrtc/integration/ConnectionTest.java
@@ -8,7 +8,6 @@
 
 package org.saltyrtc.tasks.webrtc.integration;
 
-import android.content.Context;
 import android.support.test.filters.LargeTest;
 import android.support.test.runner.AndroidJUnit4;
 
@@ -28,7 +27,6 @@
 import org.saltyrtc.tasks.webrtc.WebRTCTask;
 import org.webrtc.DataChannel;
 import org.webrtc.IceCandidate;
-import org.webrtc.MediaConstraints;
 import org.webrtc.MediaStream;
 import org.webrtc.PeerConnection;
 import org.webrtc.PeerConnectionFactory;
@@ -99,21 +97,22 @@ public void onAddTrack(RtpReceiver rtpReceiver, MediaStream[] mediaStreams) {
     }
 
     private PeerConnection createPeerConnection() {
-        // Initialize Android globals
-        // See https://bugs.chromium.org/p/webrtc/issues/detail?id=3416
-        Context context = null;
-        final boolean ok = PeerConnectionFactory.initializeAndroidGlobals(context, true, true, false);
-        if (!ok) {
-            throw new RuntimeException("Could not initialize Android globals");
-        }
+        // Initialize
+        PeerConnectionFactory.initialize(
+            PeerConnectionFactory.InitializationOptions
+                .builder(null)
+                .setEnableInternalTracer(false)
+                .createInitializationOptions()
+        );
 
         // Create peer connection
         final PeerConnectionFactory.Options options = new PeerConnectionFactory.Options();
-        final PeerConnectionFactory factory = new PeerConnectionFactory(options);
-        final MediaConstraints constraints = new MediaConstraints();
+        final PeerConnectionFactory factory = PeerConnectionFactory
+            .builder()
+            .setOptions(options)
+            .createPeerConnectionFactory();
         return factory.createPeerConnection(
             new ArrayList<PeerConnection.IceServer>(),
-            constraints,
             new PeerConnectionObserver()
         );
     }