Add more media stats. (#384)

Author: dennwc

pkg/mixer/mixer.go

@@ -175,7 +175,11 @@ func (m *Mixer) mixUpdate() {
 		if dt := now.Sub(m.lastMixEndTs); dt > 0 {
 			n = int(dt / m.tickerDur)
 			m.lastMixEndTs = m.lastMixEndTs.Add(time.Duration(n) * m.tickerDur)
-			m.stats.JumpMixes.Add(uint64(n))
+			if n == 1 {
+				m.stats.TimedMixes.Add(1)
+			} else if n != 0 {
+				m.stats.JumpMixes.Add(uint64(n))
+			}
 		}
 	}
 	if n == 0 {

pkg/sip/media.go

@@ -43,6 +43,7 @@ type StatsSnapshot struct {
 }
 
 type PortStatsSnapshot struct {
+	Streams        uint64 `json:"streams"`
 	Packets        uint64 `json:"packets"`
 	IgnoredPackets uint64 `json:"packets_ignored"`
 	InputPackets   uint64 `json:"packets_input"`
@@ -52,6 +53,9 @@ type PortStatsSnapshot struct {
 
 	AudioPackets uint64 `json:"audio_packets"`
 	AudioBytes   uint64 `json:"audio_bytes"`
+
+	DTMFPackets uint64 `json:"dtmf_packets"`
+	DTMFBytes   uint64 `json:"dtmf_bytes"`
 }
 
 type RoomStatsSnapshot struct {
@@ -91,13 +95,16 @@ func (s *Stats) Load() StatsSnapshot {
 	m := &r.Mixer
 	return StatsSnapshot{
 		Port: PortStatsSnapshot{
+			Streams:        p.Streams.Load(),
 			Packets:        p.Packets.Load(),
 			IgnoredPackets: p.IgnoredPackets.Load(),
 			InputPackets:   p.InputPackets.Load(),
 			MuxPackets:     p.MuxPackets.Load(),
 			MuxBytes:       p.MuxBytes.Load(),
 			AudioPackets:   p.AudioPackets.Load(),
 			AudioBytes:     p.AudioBytes.Load(),
+			DTMFPackets:    p.DTMFPackets.Load(),
+			DTMFBytes:      p.DTMFBytes.Load(),
 		},
 		Room: RoomStatsSnapshot{
 			InputPackets:  r.InputPackets.Load(),
@@ -237,7 +244,7 @@ func (r *rtpReaderCount) ReadRTP() (*prtp.Packet, interceptor.Attributes, error)
 	p, in, err := r.r.ReadRTP()
 	if p != nil {
 		r.packets.Add(1)
-		r.packets.Add(uint64(len(p.Payload)))
+		r.bytes.Add(uint64(len(p.Payload)))
 	}
 	return p, in, err
 }

pkg/sip/media_port.go

@@ -40,6 +40,7 @@ import (
 )
 
 type PortStats struct {
+	Streams        atomic.Uint64
 	Packets        atomic.Uint64
 	IgnoredPackets atomic.Uint64
 	InputPackets   atomic.Uint64
@@ -49,6 +50,9 @@ type PortStats struct {
 
 	AudioPackets atomic.Uint64
 	AudioBytes   atomic.Uint64
+
+	DTMFPackets atomic.Uint64
+	DTMFBytes   atomic.Uint64
 }
 
 type UDPConn interface {
@@ -405,6 +409,7 @@ func (p *MediaPort) rtpLoop(sess rtp.Session) {
 			}
 			return
 		}
+		p.stats.Streams.Add(1)
 		p.mediaReceived.Break()
 		log := p.log.WithValues("ssrc", ssrc)
 		log.Infow("accepting RTP stream")
@@ -521,20 +526,26 @@ func (p *MediaPort) setupInput() {
 	mux.Register(
 		p.conf.Audio.Type, newRTPHandlerCount(
 			newRTPStatsHandler(p.mon, p.conf.Audio.Codec.Info().SDPName, audioHandler),
-			&p.stats.AudioPackets, &p.stats.AudioBytes),
+			&p.stats.AudioPackets, &p.stats.AudioBytes,
+		),
 	)
 	if p.conf.Audio.DTMFType != 0 {
-		mux.Register(p.conf.Audio.DTMFType, newRTPStatsHandler(p.mon, dtmf.SDPName, rtp.HandlerFunc(func(h *rtp.Header, payload []byte) error {
-			ptr := p.dtmfIn.Load()
-			if ptr == nil {
-				return nil
-			}
-			fnc := *ptr
-			if ev, ok := dtmf.DecodeRTP(h, payload); ok && fnc != nil {
-				fnc(ev)
-			}
-			return nil
-		})))
+		mux.Register(
+			p.conf.Audio.DTMFType, newRTPHandlerCount(
+				newRTPStatsHandler(p.mon, dtmf.SDPName, rtp.HandlerFunc(func(h *rtp.Header, payload []byte) error {
+					ptr := p.dtmfIn.Load()
+					if ptr == nil {
+						return nil
+					}
+					fnc := *ptr
+					if ev, ok := dtmf.DecodeRTP(h, payload); ok && fnc != nil {
+						fnc(ev)
+					}
+					return nil
+				})),
+				&p.stats.DTMFPackets, &p.stats.DTMFBytes,
+			),
+		)
 	}
 	var hnd rtp.Handler = newRTPHandlerCount(mux, &p.stats.MuxPackets, &p.stats.MuxBytes)
 	if p.jitterEnabled {