MT#55283 extend search for compatible codec

NGCP-Flow: mr14.1
Change-Id: Ib1b9e08e65ff26c544d7deff99ab3c7d57cb4673
(cherry picked from commit dceba982de)

daemon/codec.c

@@ -6108,6 +6108,16 @@ void codec_store_transcode(struct codec_store *cs, str_q *offer, struct codec_st
 		}
 		GQueue *orig_list = t_hash_table_lookup(orig->codec_names, codec);
 		if (!orig_list || !orig_list->length || cs->strip_full) {
+			// check for a compatible entry on opposite side
+			codec_store_find_matching_codecs(NULL, &pt_match, orig, codec, pt);
+			if (pt_match) {
+				ilogs(codec, LOG_DEBUG, "Adding previously existing codec " STR_FORMAT,
+						STR_FMT(&pt_match->encoding_with_full_params));
+				codec_touched(cs, pt_match);
+				codec_store_add_order(cs, pt_match);
+				continue;
+			}
+
 			ilogs(codec, LOG_DEBUG, "Adding codec " STR_FORMAT
 					" for transcoding",
 					STR_FMT(codec));

t/auto-daemon-tests.pl

@@ -7496,11 +7496,11 @@ o=- 2405046764736097547 2405046764736097550 IN IP4 192.168.178.104
 s=SDP data
 c=IN IP4 192.168.178.104
 t=0 0
-m=audio 15028 RTP/AVP 0 8 97 98 96
+m=audio 15028 RTP/AVP 0 8 99 98 96
 a=rtpmap:0 PCMU/8000
 a=rtpmap:8 PCMA/8000
-a=rtpmap:97 opus/48000/2
-a=fmtp:97 stereo=0; sprop-stereo=0; useinbandfec=1
+a=rtpmap:99 opus/48000/2
+a=fmtp:99 stereo=0; sprop-stereo=0; useinbandfec=1
 a=rtpmap:98 telephone-event/48000
 a=fmtp:98 0-15
 a=rtpmap:96 telephone-event/8000
@@ -15576,17 +15576,16 @@ v=0
 o=- 3816337545 3816337545 IN IP4 ims.example.com
 s=-
 t=0 0
-m=audio PORT RTP/AVP 9 97 108 8 96 98 101
+m=audio PORT RTP/AVP 9 111 108 8 96 97 101
 c=IN IP4 203.0.113.1
 a=rtpmap:9 G722/8000
-a=rtpmap:97 opus/48000
-a=fmtp:97 useinbandfec=1
+a=rtpmap:111 opus/48000
 a=rtpmap:108 speex/16000
 a=rtpmap:8 PCMA/8000
 a=rtpmap:96 telephone-event/8000
 a=fmtp:96 0-15
-a=rtpmap:98 telephone-event/16000
-a=fmtp:98 0-15
+a=rtpmap:97 telephone-event/16000
+a=fmtp:97 0-15
 a=rtpmap:101 telephone-event/48000
 a=fmtp:101 0-15
 a=sendrecv
@@ -15691,13 +15690,13 @@ v=0
 o=- 1545997027 1 IN IP4 203.0.113.1
 s=tester
 t=0 0
-m=audio PORT RTP/AVP 8 108 97 96 101
+m=audio PORT RTP/AVP 8 108 111 96 101
 c=IN IP4 203.0.113.1
 a=rtpmap:8 PCMA/8000
 a=rtpmap:108 AMR/8000
 a=fmtp:108 mode-set=7
-a=rtpmap:97 AMR-WB/16000
-a=fmtp:97 mode-set=0,1,2;mode-change-period=2;mode-change-capability=2
+a=rtpmap:111 AMR-WB/16000
+a=fmtp:111 mode-set=0,1,2; mode-change-period=2; mode-change-capability=2
 a=rtpmap:96 telephone-event/16000
 a=fmtp:96 0-15
 a=rtpmap:101 telephone-event/8000
@@ -15713,10 +15712,10 @@ v=0
 o=- 1545997027 1 IN IP4 198.51.100.10
 s=tester
 t=0 0
-m=audio 3064 RTP/AVP 97 96
+m=audio 3064 RTP/AVP 111 96
 c=IN IP4 198.51.100.10
-a=rtpmap:97 AMR-WB/16000
-a=fmtp:97 octet-align=0; mode-set=0,1,2; max-red=0; mode-change-capability=2
+a=rtpmap:111 AMR-WB/16000
+a=fmtp:111 octet-align=0; mode-set=0,1,2; max-red=0; mode-change-capability=2
 a=rtpmap:96 telephone-event/16000
 a=fmtp:96 0-16
 a=ptime:20
@@ -15728,7 +15727,7 @@ t=0 0
 m=audio PORT RTP/AVP 111 96
 c=IN IP4 203.0.113.1
 a=rtpmap:111 AMR-WB/16000
-a=fmtp:111 mode-set=0,1,2; mode-change-period=2; mode-change-capability=2
+a=fmtp:111 octet-align=0; mode-set=0,1,2; max-red=0; mode-change-capability=2
 a=rtpmap:96 telephone-event/16000
 a=fmtp:96 0-15
 a=sendrecv
@@ -15773,13 +15772,13 @@ v=0
 o=- 1545997027 1 IN IP4 203.0.113.1
 s=tester
 t=0 0
-m=audio PORT RTP/AVP 8 108 97 96 101
+m=audio PORT RTP/AVP 8 108 111 96 101
 c=IN IP4 203.0.113.1
 a=rtpmap:8 PCMA/8000
 a=rtpmap:108 AMR/8000
 a=fmtp:108 mode-set=7
-a=rtpmap:97 AMR-WB/16000
-a=fmtp:97 mode-set=0,1,2;mode-change-period=2;mode-change-capability=2
+a=rtpmap:111 AMR-WB/16000
+a=fmtp:111 mode-set=0,1,2; mode-change-period=2; mode-change-capability=2
 a=rtpmap:96 telephone-event/16000
 a=fmtp:96 0-15
 a=rtpmap:101 telephone-event/8000
@@ -15795,10 +15794,10 @@ v=0
 o=- 1545997027 1 IN IP4 198.51.100.10
 s=tester
 t=0 0
-m=audio 3068 RTP/AVP 97 96
+m=audio 3068 RTP/AVP 111 96
 c=IN IP4 198.51.100.10
-a=rtpmap:97 AMR-WB/16000
-a=fmtp:97 octet-align=0; mode-set=0,1,2; max-red=0; mode-change-capability=2
+a=rtpmap:111 AMR-WB/16000
+a=fmtp:111 octet-align=0; mode-set=0,1,2; max-red=0; mode-change-capability=2
 a=rtpmap:96 telephone-event/16000
 a=fmtp:96 0-16
 a=ptime:20
@@ -15810,7 +15809,7 @@ t=0 0
 m=audio PORT RTP/AVP 111 96
 c=IN IP4 203.0.113.1
 a=rtpmap:111 AMR-WB/16000
-a=fmtp:111 mode-set=0,1,2; mode-change-period=2; mode-change-capability=2
+a=fmtp:111 octet-align=0; mode-set=0,1,2; max-red=0; mode-change-capability=2
 a=rtpmap:96 telephone-event/16000
 a=fmtp:96 0-15
 a=sendrecv
@@ -15852,11 +15851,11 @@ v=0
 o=- 3812713289 3812713289 IN IP4 foo.bar.com
 s=-
 t=0 0
-m=audio PORT RTP/AVP 9 97 108 8 96 101
+m=audio PORT RTP/AVP 9 111 108 8 96 101
 c=IN IP4 203.0.113.1
 a=rtpmap:9 G722/8000
-a=rtpmap:97 AMR-WB/16000
-a=fmtp:97 mode-set=0,1,2;mode-change-period=2;mode-change-capability=2
+a=rtpmap:111 AMR-WB/16000
+a=fmtp:111 mode-set=0,1,2; mode-change-period=2; mode-change-capability=2
 a=rtpmap:108 AMR/8000
 a=fmtp:108 mode-set=7
 a=rtpmap:8 PCMA/8000
@@ -15932,11 +15931,11 @@ v=0
 o=- 3812713289 3812713289 IN IP4 foo.bar.com
 s=-
 t=0 0
-m=audio PORT RTP/AVP 9 97 108 8 96 101
+m=audio PORT RTP/AVP 9 111 108 8 96 101
 c=IN IP4 203.0.113.1
 a=rtpmap:9 G722/8000
-a=rtpmap:97 AMR-WB/16000
-a=fmtp:97 mode-set=0,1,2;mode-change-period=2;mode-change-capability=2
+a=rtpmap:111 AMR-WB/16000
+a=fmtp:111 mode-set=0,1,2; mode-change-period=2; mode-change-capability=2
 a=rtpmap:108 AMR/8000
 a=fmtp:108 mode-set=7
 a=rtpmap:8 PCMA/8000
@@ -16012,11 +16011,11 @@ v=0
 o=- 3812713289 3812713289 IN IP4 foo.bar.com
 s=-
 t=0 0
-m=audio PORT RTP/AVP 9 97 108 8 96 101
+m=audio PORT RTP/AVP 9 111 108 8 96 101
 c=IN IP4 203.0.113.1
 a=rtpmap:9 G722/8000
-a=rtpmap:97 AMR-WB/16000
-a=fmtp:97 mode-set=0,1,2;mode-change-period=2;mode-change-capability=2
+a=rtpmap:111 AMR-WB/16000
+a=fmtp:111 mode-set=0,1,2; mode-change-period=2; mode-change-capability=2
 a=rtpmap:108 AMR/8000
 a=fmtp:108 mode-set=7
 a=rtpmap:8 PCMA/8000