fix: rtp DTMF reader was broken #31

Author: emiago

media/rtp_dtmf_reader.go

@@ -60,7 +60,10 @@ func (w *RTPDtmfReader) processDTMFEvent(ev DTMFEvent) {
 		// Expensive call on logger
 		log.Debug().Interface("ev", ev).Msg("Processing DTMF event")
 	}
-	if ev.EndOfEvent && w.lastEv.Duration > 0 {
+	if ev.EndOfEvent {
+		if w.lastEv.Duration == 0 {
+			return
+		}
 		// Does this match to our last ev
 		// Consider Event can be 0, that is why we check is also lastEv.Duration set
 		if w.lastEv.Event != ev.Event {
@@ -78,7 +81,7 @@ func (w *RTPDtmfReader) processDTMFEvent(ev DTMFEvent) {
 		w.lastEv = DTMFEvent{}
 		return
 	}
-	if w.lastEv.Event == ev.Event {
+	if w.lastEv.Duration > 0 && w.lastEv.Event == ev.Event {
 		return
 	}
 	w.lastEv = ev

media/rtp_dtmf_reader_test.go

@@ -46,3 +46,43 @@ func TestDTMFReader(t *testing.T) {
 
 	assert.Equal(t, "109", detected.String())
 }
+
+func TestDTMFReaderRepeated(t *testing.T) {
+	r := RTPDtmfReader{}
+
+	// DTMF 109
+	sequence := []DTMFEvent{
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 160},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 320},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 480},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 640},
+		{Event: 1, EndOfEvent: true, Volume: 10, Duration: 800},
+		{Event: 1, EndOfEvent: true, Volume: 10, Duration: 800},
+		{Event: 1, EndOfEvent: true, Volume: 10, Duration: 800},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 160},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 320},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 480},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 640},
+		{Event: 1, EndOfEvent: true, Volume: 10, Duration: 800},
+		{Event: 1, EndOfEvent: true, Volume: 10, Duration: 800},
+		{Event: 1, EndOfEvent: true, Volume: 10, Duration: 800},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 160},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 320},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 480},
+		{Event: 1, EndOfEvent: false, Volume: 10, Duration: 640},
+		{Event: 1, EndOfEvent: true, Volume: 10, Duration: 800},
+		{Event: 1, EndOfEvent: true, Volume: 10, Duration: 800},
+		{Event: 1, EndOfEvent: true, Volume: 10, Duration: 800},
+	}
+
+	detected := strings.Builder{}
+	for _, ev := range sequence {
+		r.processDTMFEvent(ev)
+		dtmf, set := r.ReadDTMF()
+		if set {
+			detected.WriteRune(dtmf)
+		}
+	}
+
+	assert.Equal(t, "111", detected.String())
+}