sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upgrade libwebrtc to m90 and enable extmap-allow-mixed

This commit is contained in:
Daniel Gultsch 2021-05-03 09:48:46 +02:00
parent ac7855a332
commit 0717f9ba18
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -11,7 +11,7 @@ android:
- '.+' - '.+'
before_script: before_script:
- mkdir libs - 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: script:
- ./gradlew assembleQuicksyFreeCompatDebug - ./gradlew assembleQuicksyFreeCompatDebug
- ./gradlew assembleQuicksyFreeSystemDebug - ./gradlew assembleQuicksyFreeSystemDebug

2
build.gradle
View File

@ -78,7 +78,7 @@ dependencies {
implementation 'com.google.guava:guava:30.1-android' implementation 'com.google.guava:guava:30.1-android'
quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.12.18' 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 { ext {

1
src/main/java/eu/siacs/conversations/Config.java
View File

@ -109,7 +109,6 @@ public final class Config {
public static final boolean USE_BOOKMARKS2 = false; 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 DISABLE_PROXY_LOOKUP = false; //useful to debug ibb
public static final boolean USE_DIRECT_JINGLE_CANDIDATES = true; public static final boolean USE_DIRECT_JINGLE_CANDIDATES = true;
public static final boolean DISABLE_HTTP_UPLOAD = false; public static final boolean DISABLE_HTTP_UPLOAD = false;

2
src/main/java/eu/siacs/conversations/xmpp/jingle/SessionDescription.java
View File

@ -215,7 +215,7 @@ public class SessionDescription {
mediaAttributes.put("extmap", id + " " + uri); 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", ""); mediaAttributes.put("extmap-allow-mixed", "");
} }