upgrade libwebrtc to m90 and enable extmap-allow-mixed

Daniel Gultsch created 4 years ago

Change summary

.travis.yml                                                              | 2 
build.gradle                                                             | 2 
src/main/java/eu/siacs/conversations/Config.java                         | 1 
src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java | 2 
4 files changed, 3 insertions(+), 4 deletions(-)

Detailed changes

.travis.yml

@@ -11,7 +11,7 @@ android:
     - '.+'
 before_script:
     - mkdir libs
-    - wget -O libs/libwebrtc-m89.aar https://gultsch.de/files/libwebrtc-m89.aar
+    - wget -O libs/libwebrtc-m90.aar https://gultsch.de/files/libwebrtc-m90.aar
 script:
     - ./gradlew assembleQuicksyFreeCompatDebug
     - ./gradlew assembleQuicksyFreeSystemDebug

build.gradle

@@ -78,7 +78,7 @@ dependencies {
 
     implementation 'com.google.guava:guava:30.1-android'
     quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.18'
-    implementation fileTree(include: ['libwebrtc-m89.aar'], dir: 'libs')
+    implementation fileTree(include: ['libwebrtc-m90.aar'], dir: 'libs')
 }
 
 ext {

src/main/java/eu/siacs/conversations/Config.java

@@ -109,7 +109,6 @@ public final class Config {
 
     public static final boolean USE_BOOKMARKS2 = false;
 
-    public static final boolean PROCESS_EXTMAP_ALLOW_MIXED = false;
     public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb
     public static final boolean USE_DIRECT_JINGLE_CANDIDATES = true;
     public static final boolean DISABLE_HTTP_UPLOAD = false;

src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java

@@ -215,7 +215,7 @@ public class SessionDescription {
                 mediaAttributes.put("extmap", id + " " + uri);
             }
 
-            if (Config.PROCESS_EXTMAP_ALLOW_MIXED && description.hasChild("extmap-allow-mixed", Namespace.JINGLE_RTP_HEADER_EXTENSIONS)) {
+            if (description.hasChild("extmap-allow-mixed", Namespace.JINGLE_RTP_HEADER_EXTENSIONS)) {
                 mediaAttributes.put("extmap-allow-mixed", "");
             }