From 46176f2937664a7ff24f6b1bd4468df859fa5329 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Tue, 15 Dec 2020 14:47:12 -0500
Subject: [PATCH] TT#101653 defuse codec tracker so it doesn't remove too many

closes #1136

Change-Id: I692cd15daf57bb95c5592099713bdc46338d4321
---
 daemon/codec.c         |  4 ---
 t/auto-daemon-tests.pl | 64 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/daemon/codec.c b/daemon/codec.c
index 2b70733c7..291c13bf3 100644
--- a/daemon/codec.c
+++ b/daemon/codec.c
@@ -771,7 +771,6 @@ static void __eliminate_rejected_codecs(struct call_media *receiver, struct call
 		}
 		ilog(LOG_DEBUG, "Eliminating asymmetric outbound codec " STR_FORMAT,
 				STR_FMT(&pt->encoding_with_params));
-		codec_touched(pt, receiver);
 		l = __delete_send_codec(receiver, l);
 	}
 }
@@ -3448,9 +3447,6 @@ void codec_rtp_payload_types(struct call_media *media, struct call_media *other_
 			}
 			ilog(LOG_DEBUG, "Eliminating asymmetric inbound codec " STR_FORMAT,
 					STR_FMT(&pt->encoding_with_params));
-#ifdef WITH_TRANSCODING
-			codec_touched(pt, other_media);
-#endif
 			l = __delete_receiver_codec(other_media, l);
 		}
 	}
diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl
index e7fa6ce0f..4a39a0efb 100755
--- a/t/auto-daemon-tests.pl
+++ b/t/auto-daemon-tests.pl
@@ -38,6 +38,70 @@ my ($sock_a, $sock_b, $sock_c, $sock_d, $port_a, $port_b, $ssrc, $ssrc_b, $resp,
 
 
 
+new_call;
+
+offer('gh#1136',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+t=0 0
+m=audio 16478 RTP/AVP 102 9 0 110 18 127
+c=IN IP4 198.51.100.1
+a=rtpmap:102 G7221/16000
+a=fmtp:102 bitrate=32000
+a=rtpmap:9 G722/8000
+a=rtpmap:0 PCMU/8000
+a=rtpmap:110 iLBC/8000
+a=fmtp:110 mode=30
+a=rtpmap:18 G729/8000
+a=fmtp:18 annexb=no
+a=rtpmap:127 telephone-event/8000
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 102 9 0 110 18 127
+c=IN IP4 203.0.113.1
+a=rtpmap:102 G7221/16000
+a=fmtp:102 bitrate=32000
+a=rtpmap:9 G722/8000
+a=rtpmap:0 PCMU/8000
+a=rtpmap:110 iLBC/8000
+a=fmtp:110 mode=30
+a=rtpmap:18 G729/8000
+a=fmtp:18 annexb=no
+a=rtpmap:127 telephone-event/8000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
+answer('gh#1136',
+	{ }, <<SDP);
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+t=0 0
+m=audio 16478 RTP/AVP 102 127
+c=IN IP4 198.51.100.1
+a=rtpmap:102 G7221/16000
+a=fmtp:102 bitrate=32000
+a=rtpmap:127 telephone-event/8000
+----------------------------------
+v=0
+o=- 1545997027 1 IN IP4 198.51.101.40
+s=tester
+t=0 0
+m=audio PORT RTP/AVP 102 127
+c=IN IP4 203.0.113.1
+a=rtpmap:102 G7221/16000
+a=fmtp:102 bitrate=32000
+a=rtpmap:127 telephone-event/8000
+a=sendrecv
+a=rtcp:PORT
+SDP
+
 # simple codec masking
 
 new_call;