From d3bf479f10fc7fa073250742a05dbf4a7644cc11 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Thu, 11 Jan 2024 11:13:39 -0500 Subject: [PATCH] MT#55283 remove a=msid exception Fix up tests to match reordered attributes Change-Id: I12ac6497bca51dfc0890aa74f3fabe5b07b68c4a --- daemon/call.c | 1 - daemon/sdp.c | 13 ------------- t/auto-daemon-tests-websocket.py | 4 ++-- t/auto-daemon-tests.pl | 4 ++-- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/daemon/call.c b/daemon/call.c index acf066085..99418dc45 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -2703,7 +2703,6 @@ static void __media_init_from_flags(struct call_media *other_media, struct call_ /* moved as plain text attributes, required later by sdp_create() * ssrc * ssrc-group - * msid * extmap * other (unknown type) */ diff --git a/daemon/sdp.c b/daemon/sdp.c index 182d84a15..422b98f5a 100644 --- a/daemon/sdp.c +++ b/daemon/sdp.c @@ -68,7 +68,6 @@ enum attr_id { ATTR_MAXPTIME, ATTR_DIRECTION, ATTR_LABEL, - ATTR_MSID, ATTR_TLS_ID, ATTR_END_OF_CANDIDATES, }; @@ -1258,9 +1257,6 @@ static int parse_attribute(struct sdp_attribute *a) { case CSH_LOOKUP("direction"): a->attr = ATTR_DIRECTION; break; - case CSH_LOOKUP("msid"): - a->attr = ATTR_MSID; - break; } return ret; @@ -1885,14 +1881,6 @@ int sdp_streams(const sdp_sessions_q *sessions, sdp_streams_q *streams, sdp_ng_f t_queue_push_tail(&sp->attributes, ret); } - /* a=msid */ - attrs = attr_list_get_by_id(&media->attributes, ATTR_MSID); - for (__auto_type ll = attrs ? attrs->head : NULL; ll; ll = ll->next) { - attr = ll->data; - str * ret = str_dup(&attr->line_value); - t_queue_push_tail(&sp->attributes, ret); - } - /* a=extmap */ if (!flags->strip_extmap) { attrs = attr_list_get_by_id(&media->attributes, ATTR_EXTMAP); @@ -2506,7 +2494,6 @@ static int process_media_attributes(struct sdp_chopper *chop, struct sdp_media * */ case ATTR_OTHER: case ATTR_SSRC: - case ATTR_MSID: goto strip; default: diff --git a/t/auto-daemon-tests-websocket.py b/t/auto-daemon-tests-websocket.py index 3121baac0..6ff0049a4 100644 --- a/t/auto-daemon-tests-websocket.py +++ b/t/auto-daemon-tests-websocket.py @@ -1731,13 +1731,13 @@ class TestVideoroom(unittest.TestCase): "a=ssrc:677770262 msid:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC 2de0f1b0-3a39-450e-9804-8305ec87452b\r\n" "a=ssrc:677770262 mslabel:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC\r\n" "a=ssrc:677770262 label:2de0f1b0-3a39-450e-9804-8305ec87452b\r\n" - "a=msid:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC 2de0f1b0-3a39-450e-9804-8305ec87452b\r\n" "a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level\r\n" "a=extmap:2 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time\r\n" "a=extmap:3 http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01\r\n" "a=extmap:4 urn:ietf:params:rtp-hdrext:sdes:mid\r\n" "a=extmap:5 urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id\r\n" "a=extmap:6 urn:ietf:params:rtp-hdrext:sdes:repaired-rtp-stream-id\r\n" + "a=msid:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC 2de0f1b0-3a39-450e-9804-8305ec87452b\r\n" "a=sendonly\r\n" "a=rtcp-mux\r\n" "a=setup:actpass\r\n" @@ -1766,7 +1766,6 @@ class TestVideoroom(unittest.TestCase): "a=ssrc:2001490794 msid:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC 6d6ec7a7-e3d7-4c82-b03c-45e017713abd\r\n" "a=ssrc:2001490794 mslabel:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC\r\n" "a=ssrc:2001490794 label:6d6ec7a7-e3d7-4c82-b03c-45e017713abd\r\n" - "a=msid:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC 6d6ec7a7-e3d7-4c82-b03c-45e017713abd\r\n" "a=extmap:14 urn:ietf:params:rtp-hdrext:toffset\r\n" "a=extmap:2 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time\r\n" "a=extmap:13 urn:3gpp:video-orientation\r\n" @@ -1778,6 +1777,7 @@ class TestVideoroom(unittest.TestCase): "a=extmap:4 urn:ietf:params:rtp-hdrext:sdes:mid\r\n" "a=extmap:5 urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id\r\n" "a=extmap:6 urn:ietf:params:rtp-hdrext:sdes:repaired-rtp-stream-id\r\n" + "a=msid:hJifdaJwqEqHxSG0pVbs1DrLAwiHqz7fKlqC 6d6ec7a7-e3d7-4c82-b03c-45e017713abd\r\n" "a=rtcp-rsize\r\n" "a=sendonly\r\n" "a=rtcp-mux\r\n" diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl index 5047a4ab1..bb7e9c131 100755 --- a/t/auto-daemon-tests.pl +++ b/t/auto-daemon-tests.pl @@ -14076,12 +14076,12 @@ a=ssrc:2628106563 cname:wMyHbPOf/cCq2tup a=ssrc:2628106563 msid:qDSKVQw0XQOFzGhek25Kn3RLxyHTM2ooxMUY 7d669de6-65e9-4fbe-829e-e89dc4baf81c a=ssrc:2628106563 mslabel:qDSKVQw0XQOFzGhek25Kn3RLxyHTM2ooxMUY a=ssrc:2628106563 label:7d669de6-65e9-4fbe-829e-e89dc4baf81c -a=msid:qDSKVQw0XQOFzGhek25Kn3RLxyHTM2ooxMUY 7d669de6-65e9-4fbe-829e-e89dc4baf81c a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level a=extmap:2 http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01 a=extmap:3 urn:ietf:params:rtp-hdrext:sdes:mid a=extmap:4 urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id a=extmap:5 urn:ietf:params:rtp-hdrext:sdes:repaired-rtp-stream-id +a=msid:qDSKVQw0XQOFzGhek25Kn3RLxyHTM2ooxMUY 7d669de6-65e9-4fbe-829e-e89dc4baf81c a=sendrecv a=candidate:ICEBASE 1 UDP 16777215 203.0.113.1 PORT typ relay raddr 203.0.113.1 rport PORT a=candidate:ICEBASE 1 UDP 16776959 2001:db8:4321::1 PORT typ relay raddr 2001:db8:4321::1 rport PORT @@ -14183,12 +14183,12 @@ a=rtpmap:112 telephone-event/32000 a=rtpmap:113 telephone-event/16000 a=rtpmap:126 telephone-event/8000 a=ssrc:97254339 cname:d7zRWvteaW9fc2Yu -a=msid:9z51ZTKhoszc7zqj5gxEX309ODe940YpMplv 8a622ecc-1fff-4675-8bf4-7b924845b3fd a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level a=extmap:2 http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01 a=extmap:3 urn:ietf:params:rtp-hdrext:sdes:mid a=extmap:4 urn:ietf:params:rtp-hdrext:sdes:rtp-stream-id a=extmap:5 urn:ietf:params:rtp-hdrext:sdes:repaired-rtp-stream-id +a=msid:9z51ZTKhoszc7zqj5gxEX309ODe940YpMplv 8a622ecc-1fff-4675-8bf4-7b924845b3fd a=sendrecv a=rtcp:PORT a=rtcp-mux