6.4.18-rc1 (#1563)

- Better fix for audio/video codec issues (aka black video stream)

Author: tmolitor-stud-tu

Monal/Classes/MLCall.m

@@ -893,10 +893,10 @@ -(void) offerSDP
             self.encryptionState = MLCallEncryptionStateClear;
 
         XMPPIQ* sdpIQ = [[XMPPIQ alloc] initWithType:kiqSetType to:self.fullRemoteJid];
-        [sdpIQ addChildNode:[self sanitizeJingleNode:[[MLXMLNode alloc] initWithElement:@"jingle" andNamespace:@"urn:xmpp:jingle:1" withAttributes:@{
+        [sdpIQ addChildNode:[[MLXMLNode alloc] initWithElement:@"jingle" andNamespace:@"urn:xmpp:jingle:1" withAttributes:@{
             @"action": @"session-initiate",
             @"sid": self.jmiid,
-        } andChildren:children andData:nil]]];
+        } andChildren:children andData:nil]];
         @synchronized(self.candidateQueueLock) {
             self.localSDP = sdpIQ;
         }
@@ -1592,12 +1592,12 @@ -(void) processIncomingSDP:(NSNotification*) notification
         if([iqNode check:@"{urn:xmpp:jingle:1}jingle<action=session-accept>"])
         {
             type = @"answer";
-            rawSDP = [HelperTools xml2sdp:[self sanitizeJingleNode:[iqNode findFirst:@"{urn:xmpp:jingle:1}jingle"]] withInitiator:NO];
+            rawSDP = [HelperTools xml2sdp:[iqNode findFirst:@"{urn:xmpp:jingle:1}jingle"] withInitiator:NO];
         }
         else if([iqNode check:@"{urn:xmpp:jingle:1}jingle<action=session-initiate>"])
         {
             type = @"offer";
-            rawSDP = [HelperTools xml2sdp:[self sanitizeJingleNode:[iqNode findFirst:@"{urn:xmpp:jingle:1}jingle"]] withInitiator:YES];
+            rawSDP = [HelperTools xml2sdp:[iqNode findFirst:@"{urn:xmpp:jingle:1}jingle"] withInitiator:YES];
         }
     }
     //handle session-terminate: fake jmi finish message and handle it
@@ -1711,10 +1711,10 @@ -(void) processIncomingSDP:(NSNotification*) notification
                     [self.account send:[[XMPPIQ alloc] initAsResponseTo:iqNode]];
 
                     XMPPIQ* sdpIQ = [[XMPPIQ alloc] initWithType:kiqSetType to:self.fullRemoteJid];
-                    [sdpIQ addChildNode:[self sanitizeJingleNode:[[MLXMLNode alloc] initWithElement:@"jingle" andNamespace:@"urn:xmpp:jingle:1" withAttributes:@{
+                    [sdpIQ addChildNode:[[MLXMLNode alloc] initWithElement:@"jingle" andNamespace:@"urn:xmpp:jingle:1" withAttributes:@{
                         @"action": @"session-accept",
                         @"sid": self.jmiid,
-                    } andChildren:children andData:nil]]];
+                    } andChildren:children andData:nil]];
                     [self.account send:sdpIQ];
 
                     @synchronized(self.candidateQueueLock) {
@@ -1845,17 +1845,4 @@ -(BOOL) decryptFingerprintsInIqNode:(XMPPIQ*) iqNode
     return retval;
 }
 
--(MLXMLNode*) sanitizeJingleNode:(MLXMLNode*) jingleNode
-{
-    //modify jingle to only include VP8, VP9 and H264 codecs
-    //in particular this means: not having any error correction codecs: these cause black video streams
-    NSArray* allowedCodecs = @[@"VP8"];//, @"VP9", @"H264"];
-    MLXMLNode* sanitizedNode = [jingleNode copy];
-    for(MLXMLNode* videoNode in [sanitizedNode find:@"content/{urn:xmpp:jingle:apps:rtp:1}description<media=video>"])
-        for(MLXMLNode* payloadNode in [videoNode find:@"payload-type"])
-            if(![allowedCodecs containsObject:[payloadNode findFirst:@"/@name"]])
-                [videoNode removeChildNode:payloadNode];
-    return sanitizedNode;
-}
-
 @end

Monal/Classes/WebRTCClient.swift

@@ -219,15 +219,6 @@ final class WebRTCClient: NSObject {
 //         let videoTransceiver = self.peerConnection.addTransceiver(of:.video, init:RTCRtpTransceiverInit())!
 //         videoTransceiver.sender.track = videoTrack
 
-        let capabilities = WebRTCClient.factory.rtpSenderCapabilities(forKind: kRTCMediaStreamTrackKindVideo)
-        let codecs = capabilities.codecs
-        let preferredCodecs = codecs.filter { $0.name=="VP8" }
-        do {
-            try videoTransceiver.setCodecPreferences(preferredCodecs, error: ())
-        } catch {
-            DDLogError("Error setting codec preferences: \(String(describing:error))")
-        }
-        
         self.remoteVideoTrack = videoTransceiver.receiver.track as? RTCVideoTrack
     }
 

Monal/Monal-Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UIDesignRequiresCompatibility</key>
+	<true/>
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
 		<string>im.monal.process</string>

rust/Cargo.lock

@@ -9,6 +9,7 @@ edition = "2021"
 crate-type = ["staticlib", "lib"]
 
 [dependencies]
+indexmap = {version = "2.13"}
 serde = {version = "1.0"}
 serde_derive = {version = "1.0"}
 quick-xml = { version = "0.39", features = ["serialize", "overlapped-lists"] }

rust/sdp-to-jingle/Cargo.toml

@@ -1,9 +1,11 @@
 use std::{
     any,
-    collections::{HashMap, HashSet},
+    collections::HashSet,
     net::{IpAddr, Ipv4Addr},
 };
 
+use indexmap::IndexMap;
+
 use serde_derive::{Deserialize, Serialize};
 use webrtc_sdp::{
     address::ExplicitlyTypedAddress,
@@ -482,9 +484,9 @@ pub struct JingleRtpSessions {
     #[serde(rename = "$value", skip_serializing_if = "Vec::is_empty", default)]
     item: Vec<JingleRtpSessionsValue>,
     #[serde(skip)]
-    payload_helper: HashMap<u8, JingleRtpSessionsPayloadType>,
+    payload_helper: IndexMap<u8, JingleRtpSessionsPayloadType>,
     #[serde(skip)]
-    ssrc_helper: HashMap<u32, JingleSsrc>,
+    ssrc_helper: IndexMap<u32, JingleSsrc>,
 }
 
 impl JingleRtpSessions {
@@ -493,8 +495,8 @@ impl JingleRtpSessions {
             xmlns: "urn:xmpp:jingle:apps:rtp:1".to_string(),
             media: JingleRtpSessionMedia::new_from_sdp(sdp_media),
             item: Vec::new(),
-            payload_helper: HashMap::new(),
-            ssrc_helper: HashMap::new(),
+            payload_helper: IndexMap::new(),
+            ssrc_helper: IndexMap::new(),
         }
     }
 
@@ -517,7 +519,7 @@ impl JingleRtpSessions {
         let p_t = self
             .payload_helper
             .entry(id)
-            .or_insert(JingleRtpSessionsPayloadType::new(id));
+            .or_insert_with(|| JingleRtpSessionsPayloadType::new(id));
         p_t
     }
 
@@ -528,7 +530,7 @@ impl JingleRtpSessions {
     }
 
     fn get_ssrc(&mut self, id: u32) -> &mut JingleSsrc {
-        let ssrc = self.ssrc_helper.entry(id).or_insert(JingleSsrc::new(id));
+        let ssrc = self.ssrc_helper.entry(id).or_insert_with(|| JingleSsrc::new(id));
         ssrc
     }
 
@@ -596,17 +598,20 @@ impl JingleRtpSessions {
                 jingle.add_extmap_allow_mixed();
             }
 
-            let mut attribute_map: HashMap<u8, Vec<SdpAttribute>> = HashMap::new();
+            /*
+            let mut attribute_map: IndexMap<u8, Vec<SdpAttribute>> = IndexMap::new();
             let format_ids = match media.get_formats() {
                 SdpFormatList::Strings(_) => {
                     // Ignore data-channel
                     continue;
                 }
                 SdpFormatList::Integers(formats) => formats,
             };
+            println!("SdpFormatList: {:?}", format_ids);
             for format in format_ids {
                 attribute_map.insert(*format as u8, Vec::new());
             }
+            */
 
             let mut media_transport = JingleTransport::new();
             let mut fingerprint = JingleTranportFingerprint::new();
@@ -680,10 +685,10 @@ impl JingleRtpSessions {
                         }
                     }
                     SdpAttribute::RemoteCandidate(_) => {}
-                    SdpAttribute::Rtpmap(rtmap) => {
+                    SdpAttribute::Rtpmap(rtpmap) => {
                         jingle
-                            .get_payload_type(rtmap.payload_type)
-                            .fill_from_sdp_rtpmap(rtmap);
+                            .get_payload_type(rtpmap.payload_type)
+                            .fill_from_sdp_rtpmap(rtpmap);
                     }
                     SdpAttribute::Rtcp(_) => {}
                     SdpAttribute::Rtcpfb(fb) => {