From f622ae36afd1e0e9c8fd846543865b1ae8dc95e5 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 11 Sep 2024 10:15:24 -0400 Subject: [PATCH] MT#55283 remove unused attributes These aren't used for anything Change-Id: I6b71cde5d06f02183190bf5ee693e6e7a9f49ba1 --- daemon/sdp.c | 8 -------- t/auto-daemon-tests-player-cache.pl | 8 ++++---- t/auto-daemon-tests.pl | 28 ++++++++++++++-------------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/daemon/sdp.c b/daemon/sdp.c index 224aa6506..182e95f2c 100644 --- a/daemon/sdp.c +++ b/daemon/sdp.c @@ -61,9 +61,7 @@ enum attr_id { * and needs later processing in `sdp_create()`. */ ATTR_T38MAXBITRATE, ATTR_T38FAXMAXBUFFER, - ATTR_XG726BITORDER, ATTR_MAXPTIME, - ATTR_DIRECTION, ATTR_LABEL, ATTR_TLS_ID, ATTR_END_OF_CANDIDATES, @@ -1220,18 +1218,12 @@ static int parse_attribute(struct sdp_attribute *a) { case CSH_LOOKUP("T38FaxMaxBuffer"): a->attr = ATTR_T38FAXMAXBUFFER; break; - case CSH_LOOKUP("xg726bitorder"): - a->attr = ATTR_XG726BITORDER; - break; case CSH_LOOKUP("maxptime"): a->attr = ATTR_MAXPTIME; break; case CSH_LOOKUP("label"): a->attr = ATTR_LABEL; break; - case CSH_LOOKUP("direction"): - a->attr = ATTR_DIRECTION; - break; } return ret; diff --git a/t/auto-daemon-tests-player-cache.pl b/t/auto-daemon-tests-player-cache.pl index 0be0827e5..b702f65c1 100755 --- a/t/auto-daemon-tests-player-cache.pl +++ b/t/auto-daemon-tests-player-cache.pl @@ -484,7 +484,6 @@ s=tester t=0 0 m=audio PORT RTP/AVP 98 97 8 0 3 101 c=IN IP4 203.0.113.1 -a=direction:both a=rtpmap:98 speex/16000 a=rtpmap:97 speex/8000 a=rtpmap:8 PCMA/8000 @@ -492,6 +491,7 @@ a=rtpmap:0 PCMU/8000 a=rtpmap:3 GSM/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=sendrecv a=rtcp:PORT a=ptime:20 @@ -519,12 +519,12 @@ s=tester t=0 0 m=audio PORT RTP/AVP 8 0 3 101 c=IN IP4 203.0.113.1 -a=direction:both a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:3 GSM/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=sendrecv a=rtcp:PORT a=ptime:20 @@ -561,7 +561,6 @@ s=tester t=0 0 m=audio PORT RTP/AVP 98 97 8 0 3 101 c=IN IP4 203.0.113.1 -a=direction:both a=rtpmap:98 speex/16000 a=rtpmap:97 speex/8000 a=rtpmap:8 PCMA/8000 @@ -569,6 +568,7 @@ a=rtpmap:0 PCMU/8000 a=rtpmap:3 GSM/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=sendrecv a=rtcp:PORT a=ptime:20 @@ -593,11 +593,11 @@ s=tester t=0 0 m=audio PORT RTP/AVP 8 0 101 c=IN IP4 203.0.113.1 -a=direction:both a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 +a=direction:both a=sendrecv a=rtcp:PORT a=ptime:20 diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl index dd28cdc3b..1d12b27d0 100755 --- a/t/auto-daemon-tests.pl +++ b/t/auto-daemon-tests.pl @@ -5147,11 +5147,11 @@ s=tester c=IN IP4 203.0.113.1 t=0 0 m=audio PORT RTP/AVP 104 105 -a=direction:both a=rtpmap:104 speex/16000 a=fmtp:104 max-red=0; mode-change-capability=2 a=rtpmap:105 telephone-event/16000 a=fmtp:105 0-15 +a=direction:both a=sendrecv a=rtcp:PORT a=ptime:20 @@ -11737,10 +11737,10 @@ s=- c=IN IP4 0.0.0.0 t=0 0 m=audio PORT RTP/AVP 0 101 8 -a=direction:both a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=rtpmap:8 PCMA/8000 +a=direction:both a=sendonly a=rtcp:PORT SDP @@ -11815,10 +11815,10 @@ s=- c=IN IP4 0.0.0.0 t=0 0 m=audio PORT RTP/SAVPF 0 101 8 -a=direction:both a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=rtpmap:8 PCMA/8000 +a=direction:both a=sendonly a=rtcp:PORT SDP @@ -11893,10 +11893,10 @@ s=- c=IN IP4 0.0.0.0 t=0 0 m=audio PORT RTP/AVPF 0 101 8 -a=direction:both a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=rtpmap:8 PCMA/8000 +a=direction:both a=sendonly a=rtcp:PORT SDP @@ -12437,10 +12437,10 @@ s= c=IN IP4 203.0.113.1 t=0 0 m=audio PORT RTP/SAVP 0 101 -a=direction:both a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=silenceSupp:off - - - - a=mptime:20 - a=oldmediaip:10.50.3.190 @@ -12491,10 +12491,10 @@ s= c=IN IP4 203.0.113.1 t=0 0 m=audio PORT RTP/AVP 0 101 -a=direction:both a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=silenceSupp:off - - - - a=mptime:20 - a=oldmediaip:10.50.3.218 @@ -12533,10 +12533,10 @@ s= c=IN IP4 203.0.113.1 t=0 0 m=audio PORT RTP/SAVP 0 101 -a=direction:both a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=silenceSupp:off - - - - a=mptime:20 - a=oldmediaip:10.50.3.190 @@ -12587,10 +12587,10 @@ s= c=IN IP4 203.0.113.1 t=0 0 m=audio PORT RTP/AVP 0 101 -a=direction:both a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=silenceSupp:off - - - - a=mptime:20 - a=oldmediaip:10.50.3.218 @@ -12633,10 +12633,10 @@ s= c=IN IP4 203.0.113.1 t=0 0 m=audio PORT RTP/SAVP 0 101 -a=direction:both a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=silenceSupp:off - - - - a=mptime:20 - a=oldmediaip:10.50.3.218 @@ -21373,9 +21373,9 @@ c=IN IP4 203.0.113.1 t=0 0 a=rtpengine:LOOPER m=audio PORT RTP/AVP 0 101 -a=xg726bitorder:big-endian a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 +a=xg726bitorder:big-endian a=sendrecv a=rtcp:PORT a=ptime:20 @@ -22329,7 +22329,6 @@ s=tester t=0 0 m=audio PORT RTP/AVP 98 97 8 0 3 101 c=IN IP4 203.0.113.1 -a=direction:both a=rtpmap:98 speex/16000 a=rtpmap:97 speex/8000 a=rtpmap:8 PCMA/8000 @@ -22337,6 +22336,7 @@ a=rtpmap:0 PCMU/8000 a=rtpmap:3 GSM/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=sendrecv a=rtcp:PORT a=ptime:20 @@ -22364,12 +22364,12 @@ s=tester t=0 0 m=audio PORT RTP/AVP 8 0 3 101 c=IN IP4 203.0.113.1 -a=direction:both a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:3 GSM/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=sendrecv a=rtcp:PORT a=ptime:20 @@ -22406,7 +22406,6 @@ s=tester t=0 0 m=audio PORT RTP/AVP 98 97 8 0 3 101 c=IN IP4 203.0.113.1 -a=direction:both a=rtpmap:98 speex/16000 a=rtpmap:97 speex/8000 a=rtpmap:8 PCMA/8000 @@ -22414,6 +22413,7 @@ a=rtpmap:0 PCMU/8000 a=rtpmap:3 GSM/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-15 +a=direction:both a=sendrecv a=rtcp:PORT a=ptime:20 @@ -22438,11 +22438,11 @@ s=tester t=0 0 m=audio PORT RTP/AVP 8 0 101 c=IN IP4 203.0.113.1 -a=direction:both a=rtpmap:8 PCMA/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 +a=direction:both a=sendrecv a=rtcp:PORT a=ptime:20