TT#136955 trigger DTMF state also when decoding DTMF to PCM

Change-Id: I8a8522ecd5d370bac7f4f8846651362efccf190e

daemon/codec.c

@@ -1836,25 +1836,31 @@ static struct codec_handler *__input_handler(struct codec_handler *h, struct med
 	return h;
 }
 
-static int packet_dtmf(struct codec_ssrc_handler *ch, struct codec_ssrc_handler *input_ch,
+static int packet_dtmf_event(struct codec_ssrc_handler *ch, struct codec_ssrc_handler *input_ch,
 		struct transcode_packet *packet, struct media_packet *mp)
 {
-	{
-		LOCK(&mp->media->dtmf_lock);
-
-		if (mp->media->dtmf_ts != packet->ts) { // ignore already processed events
-			int ret = dtmf_event_packet(mp, packet->payload, ch->encoder_format.clockrate);
-			if (G_UNLIKELY(ret == -1)) // error
-				return -1;
-			if (ret == 1) {
-				// END event
-				mp->media->dtmf_ts = packet->ts;
-				input_ch->dtmf_start_ts = 0;
-			}
-			else
-				input_ch->dtmf_start_ts = packet->ts ? packet->ts : 1;
+	LOCK(&mp->media->dtmf_lock);
+
+	if (mp->media->dtmf_ts != packet->ts) { // ignore already processed events
+		int ret = dtmf_event_packet(mp, packet->payload, ch->encoder_format.clockrate);
+		if (G_UNLIKELY(ret == -1)) // error
+			return -1;
+		if (ret == 1) {
+			// END event
+			mp->media->dtmf_ts = packet->ts;
+			input_ch->dtmf_start_ts = 0;
 		}
+		else
+			input_ch->dtmf_start_ts = packet->ts ? packet->ts : 1;
 	}
+	return 0;
+}
+
+static int packet_dtmf(struct codec_ssrc_handler *ch, struct codec_ssrc_handler *input_ch,
+		struct transcode_packet *packet, struct media_packet *mp)
+{
+	if (packet_dtmf_event(ch, input_ch, packet, mp))
+		return -1;
 
 	int ret = 0;
 
@@ -3243,17 +3249,23 @@ static int packet_decode(struct codec_ssrc_handler *ch, struct codec_ssrc_handle
 	if (!ch->first_ts)
 		ch->first_ts = packet->ts;
 
-	if (input_ch->dtmf_start_ts && !rtpe_config.dtmf_no_suppress) {
-		if ((packet->ts > input_ch->dtmf_start_ts && packet->ts - input_ch->dtmf_start_ts > 80000) ||
-				(packet->ts < input_ch->dtmf_start_ts && input_ch->dtmf_start_ts - packet->ts > 80000)) {
-			ilogs(transcoding, LOG_DEBUG, "Resetting decoder DTMF state due to TS discrepancy");
-			input_ch->dtmf_start_ts = 0;
-		}
-		else {
-			ilogs(transcoding, LOG_DEBUG, "Decoder is in DTMF state, discaring codec packet");
-			if (mp->ssrc_out)
-				mp->ssrc_out->parent->seq_diff--;
+	if (ch->decoder->def->dtmf) {
+		if (packet_dtmf_event(ch, input_ch, packet, mp))
 			goto out;
+	}
+	else {
+		if (input_ch->dtmf_start_ts && !rtpe_config.dtmf_no_suppress) {
+			if ((packet->ts > input_ch->dtmf_start_ts && packet->ts - input_ch->dtmf_start_ts > 80000) ||
+					(packet->ts < input_ch->dtmf_start_ts && input_ch->dtmf_start_ts - packet->ts > 80000)) {
+				ilogs(transcoding, LOG_DEBUG, "Resetting decoder DTMF state due to TS discrepancy");
+				input_ch->dtmf_start_ts = 0;
+			}
+			else {
+				ilogs(transcoding, LOG_DEBUG, "Decoder is in DTMF state, discaring codec packet");
+				if (mp->ssrc_out)
+					mp->ssrc_out->parent->seq_diff--;
+				goto out;
+			}
 		}
 	}
 

t/auto-daemon-tests.pl

@@ -13380,7 +13380,7 @@ snd($sock_b, $port_a,  rtp(96, 2002, 4000+320, 0x5678, "\x08\x10\x00\xa0"));
 rcv($sock_a, $port_b, rtpm(0, $seq+2, 4000+320, $ssrc, "\xff\xb0\xac\xbc\x4c\x39\x3f\x63\xee\x55\x4a\xf6\xba\xaf\xbc\x45\x2c\x2d\x4b\xba\xaf\xbb\x6e\x48\x53\xf3\x5f\x3f\x3a\x52\xba\xac\xb3\x5e\x2f\x2d\x3e\xc8\xb8\xc0\xe8\x6b\xd7\xcc\x66\x39\x30\x3f\xbf\xac\xae\xd2\x37\x2f\x3c\xe1\xc6\xd2\x77\xdd\xbf\xbb\xdc\x38\x2c\x35\xd1\xae\xad\xc2\x43\x37\x40\x6e\xe7\x58\x4e\xdd\xb8\xb1\xc3\x3d\x2b\x2f\x5e\xb5\xaf\xbe\x59\x44\x51\xfb\x5b\x3f\x3d\x6b\xb6\xac\xb8\x4a\x2d\x2d\x47\xbf\xb6\xc1\xfa\x63\xda\xd1\x57\x37\x32\x49\xba\xab\xb0\xfe\x33\x2f\x40\xd2\xc2\xd1\x7e\xda\xbf\xbe\x73\x35\x2d\x3a\xc4\xac\xae\xcd\x3d\x36\x43\xf6\xdf\x5c\x55\xd2\xb7\xb4\xce\x37\x2b\x32\xdf\xb1\xaf\xc3\x4d\x41\x50\x7e\x59\x40"));
 snd($sock_b, $port_a,  rtp(96, 2003, 4000+320, 0x5678, "\x08\x10\x01\x40"));
 rcv($sock_a, $port_b, rtpm(0, $seq+3, 4000+480, $ssrc, "\x40\xe0\xb3\xad\xbd\x3f\x2c\x2f\x54\xbb\xb5\xc4\x6b\x5d\xde\xd9\x4e\x37\x35\x58\xb5\xab\xb4\x52\x2f\x2f\x47\xca\xbf\xd0\xfe\xd8\xc1\xc3\x57\x32\x2e\x40\xbc\xab\xb0\xe0\x39\x35\x46\xe3\xdb\x61\x5d\xcc\xb7\xb7\xe8\x33\x2b\x37\xcb\xae\xb0\xcb\x46\x3f\x50\x7e\x58\x41\x46\xcf\xb1\xae\xc6\x39\x2b\x31\x7d\xb7\xb5\xc8\x5d\x58\xe5\xe1\x4a\x37\x38\xf2\xb1\xab\xba\x44\x2e\x30\x4f\xc3\xbe\xd1\x7d\xd8\xc3\xc9\x4b\x30\x2f\x4c\xb6\xab\xb3\x61\x35\x35\x4b\xd8\xd6\x68\x68\xc8\xb7\xba\x5d\x30\x2c\x3c\xbf\xad\xb1\xd8\x40\x3e\x52\xfb\x58\x44\x4c\xc8\xb0\xb0\xd6\x34\x2b\x35\xd5\xb3\xb5\xcd\x54\x54\xec\xef\x47\x37\x3c\xd3\xaf\xac\xc0\x3c\x2d\x33\x63\xbe"));
-snd($sock_b, $port_a,  rtp(96, 2004, 4000+320, 0x5678, "\x08\x10\x01\xe0"));
+snd($sock_b, $port_a,  rtp(96, 2004, 4000+320, 0x5678, "\x08\x90\x01\xe0")); # end event to get out of DTMF state
 rcv($sock_a, $port_b, rtpm(0, $seq+4, 4000+640, $ssrc, "\xbd\xd3\x77\xd9\xc5\xd0\x44\x30\x32\x65\xb2\xab\xb8\x4c\x32\x35\x50\xcf\xd2\x70\x7a\xc6\xb8\xbe\x4c\x2e\x2d\x45\xb9\xac\xb4\xfd\x3c\x3d\x55\xf2\x5a\x47\x56\xc1\xb0\xb4\x71\x30\x2b\x3a\xc7\xb0\xb6\xd7\x4d\x50\xf6\x78\x45\x38\x41\xc7\xae\xae\xcc\x37\x2c\x36\xe5\xbb\xbd\xd7\x6d\xdb\xc9\xdd\x3f\x30\x36\xdc\xae\xab\xbd\x41\x2f\x37\x5d\xcb\xcf\x7b\xef\xc4\xb9\xc6\x42\x2d\x2e\x55\xb4\xac\xb8\x58\x39\x3d\x59\xea\x5c\x4a\x66\xbd\xb0\xb8\x50\x2e\x2c\x40\xbd\xaf\xb8\xe8\x48\x4e\x7d\x6b\x43\x3a\x4a\xbf\xad\xaf\xe4\x32\x2c\x3a\xcf\xb8\xbd\xdc\x66\xde\xcc\xf5\x3c\x30\x3b\xca\xad\xac\xc6\x3b\x2e\x39\x7c\xc6\xcd\xfa\xe7\xc3\xbb\xce\x3c\x2d\x31\xf2"));
 # test out of seq
 snd($sock_b, $port_a,  rtp(0, 2006, 4000+160*25, 0x5678, "\x00" x 160)); # processed because TS difference too large