1.2.4: add support for encrypted header extensions (RFC 6904)

Author: ibc

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 
-project(sdptransform VERSION 1.2.3)
+project(sdptransform VERSION 1.2.4)
 
 # For CMake >= 3.1.
 set(CMAKE_CXX_STANDARD 11)

doc/Grammar.md

@@ -230,6 +230,8 @@ if (
 
 `a=extmap:2 urn:ietf:params:rtp-hdrext:toffset`
 
+`a=extmap:3 urn:ietf:params:rtp-hdrext:encrypt urn:ietf:params:rtp-hdrext:smpte-tc 25@600/24`
+
 * multiple
 * type: object
 
@@ -238,6 +240,7 @@ if (
 | value           | integer | 1
 | direction       | string  | "recvonly"
 | uri             | string  | "URI-gps-string"
+| encrypt-uri     | string  | "urn:ietf:params:rtp-hdrext:encrypt"
 | config          | string  |
 
 

src/grammar.cpp

@@ -418,24 +418,26 @@ namespace sdptransform
 
 					// a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
 					// a=extmap:1/recvonly URI-gps-string
+					// a=extmap:3 urn:ietf:params:rtp-hdrext:encrypt urn:ietf:params:rtp-hdrext:smpte-tc 25@600/24
 					{
 						// name:
 						"",
 						// push:
 						"ext",
 						// reg:
-						std::regex("^extmap:(\\d+)(?:\\/(\\w+))? (\\S*)(?: (\\S*))?"),
+						std::regex("^extmap:(\\d+)(?:\\/(\\w+))?(?: (urn:ietf:params:rtp-hdrext:encrypt))? (\\S*)(?: (\\S*))?"),
 						// names:
-						{ "value", "direction", "uri", "config" },
+						{ "value", "direction", "encrypt-uri", "uri", "config" },
 						// types:
-						{ 'd', 's', 's', 's' },
+						{ 'd', 's', 's', 's', 's' },
 						// format:
 						"",
 						// formatFunc:
 						[](const json& o)
 						{
 							return std::string("extmap:%d") +
 								(hasValue(o, "direction") ? "/%s" : "%v") +
+								(hasValue(o, "encrypt-uri") ? " %s" : "%v") +
 								" %s" +
 								(hasValue(o, "config") ? " %s" : "");
 						}

test/data/extmap-encrypt.sdp

@@ -0,0 +1,11 @@
+v=0
+o=- 20518 0 IN IP4 203.0.113.1
+s=
+c=IN IP4 203.0.113.1
+t=0 0
+m=audio 54400 RTP/SAVPF 96
+a=rtpmap:96 opus/48000
+a=extmap:1/sendonly URI-toffset
+a=extmap:2 urn:ietf:params:rtp-hdrext:toffset
+a=extmap:3 urn:ietf:params:rtp-hdrext:encrypt urn:ietf:params:rtp-hdrext:smpte-tc 25@600/24
+a=extmap:4/recvonly urn:ietf:params:rtp-hdrext:encrypt URI-gps-string

test/parse.test.cpp

@@ -967,3 +967,64 @@ SCENARIO("multicastttlSdp", "[parse]")
 
 	REQUIRE(newSdp == sdp);
 }
+
+SCENARIO("extmapEncryptSdp", "[parse]")
+{
+	auto sdp = helpers::readFile("test/data/extmap-encrypt.sdp");
+	auto session = sdptransform::parse(sdp);
+
+	REQUIRE(session.size() > 0);
+	REQUIRE(session.find("media") != session.end());
+
+	auto& media = session.at("media");
+	auto& audio = media[0];
+	auto audioPayloads = sdptransform::parsePayloads(audio.at("payloads"));
+
+	REQUIRE(audioPayloads == R"([ 96 ])"_json);
+
+	REQUIRE(audio.at("type") == "audio");
+	REQUIRE(audio.at("port") == 54400);
+	REQUIRE(audio.at("protocol") == "RTP/SAVPF");
+	REQUIRE(audio.at("rtp")[0].at("payload") == 96);
+	REQUIRE(audio.at("rtp")[0].at("codec") == "opus");
+	REQUIRE(audio.at("rtp")[0].at("rate") == 48000);
+	REQUIRE(
+		audio.at("ext")[0] ==
+		R"({
+			"value"     : 1,
+			"direction" : "sendonly",
+			"uri"       : "URI-toffset"
+		})"_json
+	);
+	REQUIRE(
+		audio.at("ext")[1] ==
+		R"({
+			"value" : 2,
+			"uri"   : "urn:ietf:params:rtp-hdrext:toffset"
+		})"_json
+	);
+	REQUIRE(
+		audio.at("ext")[2] ==
+		R"({
+			"value"       : 3,
+			"encrypt-uri" : "urn:ietf:params:rtp-hdrext:encrypt",
+			"uri"         : "urn:ietf:params:rtp-hdrext:smpte-tc",
+			"config"      : "25@600/24"
+		})"_json
+	);
+	REQUIRE(
+		audio.at("ext")[3] ==
+		R"({
+			"value"       : 4,
+			"direction"   : "recvonly",
+			"encrypt-uri" : "urn:ietf:params:rtp-hdrext:encrypt",
+			"uri"         : "URI-gps-string"
+		})"_json
+	);
+
+	REQUIRE(media.size() == 1);
+
+	auto newSdp = sdptransform::write(session);
+
+	REQUIRE(newSdp == sdp);
+}