diff --git a/doap.xml b/doap.xml
index 40b28e3b..f3f43b13 100644
--- a/doap.xml
+++ b/doap.xml
@@ -417,6 +417,14 @@
NEXT
+
+
+
+ complete
+ 0.3
+ NEXT
+
+
diff --git a/src/jingle_rtp.rs b/src/jingle_rtp.rs
index 7e5557b2..7f9e5a1a 100644
--- a/src/jingle_rtp.rs
+++ b/src/jingle_rtp.rs
@@ -4,6 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+use crate::jingle_ssma::{Source, Group};
+
generate_element!(
/// Wrapper element describing an RTP session.
Description, "description", JINGLE_RTP,
@@ -18,7 +20,13 @@ generate_element!(
],
children: [
/// List of encodings that can be used for this RTP stream.
- payload_types: Vec = ("payload-type", JINGLE_RTP) => PayloadType
+ payload_types: Vec = ("payload-type", JINGLE_RTP) => PayloadType,
+
+ /// List of ssrc-group.
+ ssrc_groups: Vec = ("ssrc-group", JINGLE_SSMA) => Group,
+
+ /// List of ssrc.
+ ssrcs: Vec = ("ssrc", JINGLE_SSMA) => Source
// TODO: Add support for and .
]
@@ -31,6 +39,8 @@ impl Description {
media,
ssrc: None,
payload_types: Vec::new(),
+ ssrc_groups: Vec::new(),
+ ssrcs: Vec::new(),
}
}
}
diff --git a/src/jingle_ssma.rs b/src/jingle_ssma.rs
new file mode 100644
index 00000000..4d966b86
--- /dev/null
+++ b/src/jingle_ssma.rs
@@ -0,0 +1,114 @@
+// Copyright (c) 2019 Emmanuel Gil Peyrot
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+generate_element!(
+ /// Source element for the ssrc SDP attribute.
+ Source, "source", JINGLE_SSMA,
+ attributes: [
+ /// Maps to the ssrc-id parameter.
+ id: Required = "ssrc",
+ ],
+ children: [
+ /// List of attributes for this source.
+ parameters: Vec = ("parameter", JINGLE_SSMA) => Parameter
+ ]
+);
+
+impl Source {
+ /// Create a new SSMA Source element.
+ pub fn new(id: String) -> Source {
+ Source {
+ id,
+ parameters: Vec::new(),
+ }
+ }
+}
+
+generate_element!(
+ /// Parameter associated with a ssrc.
+ Parameter, "parameter", JINGLE_SSMA,
+ attributes: [
+ /// The name of the parameter.
+ name: Required = "name",
+
+ /// The optional value of the parameter.
+ value: Option = "value",
+ ]
+);
+
+generate_element!(
+ /// Element grouping multiple ssrc.
+ Group, "ssrc-group", JINGLE_SSMA,
+ attributes: [
+ /// The semantics of this group.
+ semantics: Required = "semantics",
+ ],
+ children: [
+ /// The various ssrc concerned by this group.
+ sources: Vec = ("source", JINGLE_SSMA) => Source
+ ]
+);
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+ use crate::Element;
+ use std::convert::TryFrom;
+
+ #[cfg(target_pointer_width = "32")]
+ #[test]
+ fn test_size() {
+ assert_size!(Source, 24);
+ assert_size!(Parameter, 24);
+ assert_size!(Group, 24);
+ }
+
+ #[cfg(target_pointer_width = "64")]
+ #[test]
+ fn test_size() {
+ assert_size!(Source, 48);
+ assert_size!(Parameter, 48);
+ assert_size!(Group, 48);
+ }
+
+ #[test]
+ fn parse_source() {
+ let elem: Element = "
+
+
+
+"
+ .parse()
+ .unwrap();
+ let mut ssrc = Source::try_from(elem).unwrap();
+ assert_eq!(ssrc.id, "1656081975");
+ assert_eq!(ssrc.parameters.len(), 2);
+ let parameter = ssrc.parameters.pop().unwrap();
+ assert_eq!(parameter.name, "msid");
+ assert_eq!(parameter.value.unwrap(), "MLTJKIHilGn71fNQoszkQ4jlPTuS5vJyKVIv MLTJKIHilGn71fNQoszkQ4jlPTuS5vJyKVIva0");
+ let parameter = ssrc.parameters.pop().unwrap();
+ assert_eq!(parameter.name, "cname");
+ assert_eq!(parameter.value.unwrap(), "Yv/wvbCdsDW2Prgd");
+ }
+
+ #[test]
+ fn parse_source_group() {
+ let elem: Element = "
+
+
+
+"
+ .parse()
+ .unwrap();
+ let mut group = Group::try_from(elem).unwrap();
+ assert_eq!(group.semantics, "FID");
+ assert_eq!(group.sources.len(), 2);
+ let source = group.sources.pop().unwrap();
+ assert_eq!(source.id, "386328120");
+ let source = group.sources.pop().unwrap();
+ assert_eq!(source.id, "2301230316");
+ }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 2f856e0a..7e4f034e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -183,6 +183,9 @@ pub mod jingle_dtls_srtp;
/// XEP-0328: JID Prep
pub mod jid_prep;
+/// XEP-0339: Source-Specific Media Attributes in Jingle
+pub mod jingle_ssma;
+
/// XEP-0352: Client State Indication
pub mod csi;
diff --git a/src/ns.rs b/src/ns.rs
index 5aea7a65..46090f09 100644
--- a/src/ns.rs
+++ b/src/ns.rs
@@ -188,6 +188,9 @@ pub const JINGLE_DTLS: &str = "urn:xmpp:jingle:apps:dtls:0";
/// XEP-0328: JID Prep
pub const JID_PREP: &str = "urn:xmpp:jidprep:0";
+/// XEP-0339: Source-Specific Media Attributes in Jingle
+pub const JINGLE_SSMA: &str = "urn:xmpp:jingle:apps:rtp:ssma:0";
+
/// XEP-0352: Client State Indication
pub const CSI: &str = "urn:xmpp:csi:0";