Correctly use codec names, fix deps. (#713)

Author: dennwc

go.mod

@@ -9,11 +9,11 @@ require (
 	github.com/icholy/digest v1.1.0
 	github.com/jfreymuth/oggvorbis v1.0.5
 	github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731
-	github.com/livekit/media-sdk v0.0.0-20260605182139-b8633b99de19
-	github.com/livekit/mediatransportutil v0.0.0-20260605182015-e79eb8d79819
-	github.com/livekit/protocol v1.46.6-0.20260605181725-7f0893ab5bf2
-	github.com/livekit/psrpc v0.7.2-0.20260604225640-4bab4033deca
-	github.com/livekit/server-sdk-go/v2 v2.16.7-0.20260605183249-c47ddccc5112
+	github.com/livekit/media-sdk v0.0.0-20260608145339-9568191731be
+	github.com/livekit/mediatransportutil v0.0.0-20260608063931-a3417d38cda0
+	github.com/livekit/protocol v1.46.7-0.20260605212020-c0615a2f6f84
+	github.com/livekit/psrpc v0.7.2
+	github.com/livekit/server-sdk-go/v2 v2.16.6
 	github.com/livekit/sipgo v0.13.2-0.20260519205735-a5b4a38b6ceb
 	github.com/mjibson/go-dsp v0.0.0-20180508042940-11479a337f12
 	github.com/ory/dockertest/v3 v3.12.0
@@ -31,13 +31,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 )
 
-require (
-	github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
-	github.com/pion/turn/v5 v5.0.8 // indirect
-	github.com/puzpuzpuz/xsync/v4 v4.5.0 // indirect
-	go.yaml.in/yaml/v3 v3.0.4 // indirect
-)
-
 require (
 	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260415201107-50325440f8f2.1 // indirect
 	buf.build/go/protovalidate v1.2.0 // indirect
@@ -73,6 +66,7 @@ require (
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
 	github.com/google/cel-go v0.28.1 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.6.0 // indirect
@@ -112,10 +106,12 @@ require (
 	github.com/pion/srtp/v3 v3.0.11 // indirect
 	github.com/pion/stun/v3 v3.1.4 // indirect
 	github.com/pion/transport/v4 v4.0.2 // indirect
+	github.com/pion/turn/v5 v5.0.8 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.68.1 // indirect
 	github.com/prometheus/procfs v0.20.1 // indirect
+	github.com/puzpuzpuz/xsync/v4 v4.5.0 // indirect
 	github.com/redis/go-redis/v9 v9.20.0 // indirect
 	github.com/twitchtv/twirp v8.1.3+incompatible // indirect
 	github.com/urfave/cli/v3 v3.9.0
@@ -135,6 +131,7 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.28.0 // indirect
 	go.uber.org/zap/exp v0.3.0 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/crypto v0.52.0 // indirect
 	golang.org/x/net v0.55.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect

go.sum

@@ -130,16 +130,16 @@ github.com/livekit/amrwb-cgo v0.0.0-20260527094629-96c39974d532 h1:q0Gj2RmsBLAcs
 github.com/livekit/amrwb-cgo v0.0.0-20260527094629-96c39974d532/go.mod h1:nGBFrVVLyO0RlyM2pWnP/VKaZO6W3rzecL/YlkTPkW8=
 github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731 h1:9x+U2HGLrSw5ATTo469PQPkqzdoU7be46ryiCDO3boc=
 github.com/livekit/mageutil v0.0.0-20250511045019-0f1ff63f7731/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ=
-github.com/livekit/media-sdk v0.0.0-20260605182139-b8633b99de19 h1:+kMx8l+Dh88PfEL+Oxu8czDcy+0uUegPzUBdRj8PX/c=
-github.com/livekit/media-sdk v0.0.0-20260605182139-b8633b99de19/go.mod h1:KmQH9MqnQF+/g1UoYZWCFbEDt7/I/AyvHdqisrMoauU=
-github.com/livekit/mediatransportutil v0.0.0-20260605182015-e79eb8d79819 h1:sl5uGZLkm/6L/zg7jofNBS9RvMNzuaVBPwx1o2Nsh2g=
-github.com/livekit/mediatransportutil v0.0.0-20260605182015-e79eb8d79819/go.mod h1:vsaB9n09kQVcA9AS39CW5HFYdP7jxTP1dXZbsx19iyk=
-github.com/livekit/protocol v1.46.6-0.20260605181725-7f0893ab5bf2 h1:00FgKLjdHzhVRzOeS9ULe7bqH7M7RanKSQkcF2VGS9M=
-github.com/livekit/protocol v1.46.6-0.20260605181725-7f0893ab5bf2/go.mod h1:tzczH4DNLOWDEeslrFxuu8Rk4XPXHCMhOyrphr7JrIs=
-github.com/livekit/psrpc v0.7.2-0.20260604225640-4bab4033deca h1:d6itWQ1sp5wkUPsgo7k2hNHbZyDp18NtSJg1B6lNJKA=
-github.com/livekit/psrpc v0.7.2-0.20260604225640-4bab4033deca/go.mod h1:rAI+m2+/cb4x9RXhLRtUx5ZwdfjjXOl4zi46IjEetaw=
-github.com/livekit/server-sdk-go/v2 v2.16.7-0.20260605183249-c47ddccc5112 h1:5GM2caMMr8SBoX6/QRs5f8/6B0dWk0Odlx9ZSGCgBfs=
-github.com/livekit/server-sdk-go/v2 v2.16.7-0.20260605183249-c47ddccc5112/go.mod h1:WTU4ReOjPsGN2Crz/fJXDjht96tzqNbRPCSxd3t5h38=
+github.com/livekit/media-sdk v0.0.0-20260608145339-9568191731be h1:R7+XEvNYGXk944esRS74lDaBIJxD0/Oxk6ZIVZPCh80=
+github.com/livekit/media-sdk v0.0.0-20260608145339-9568191731be/go.mod h1:uWrLXY4JeLYynX39htMG49Dl4BhFYY+RCeoXaLdU+Lw=
+github.com/livekit/mediatransportutil v0.0.0-20260608063931-a3417d38cda0 h1:XHNNzebIKZRkLimla/hFGrAIX5EMWHctrgt3hLw7s+I=
+github.com/livekit/mediatransportutil v0.0.0-20260608063931-a3417d38cda0/go.mod h1:o8CFmAdrVwzJNOCsQCLUzXRjokkufNshnQHOe4fRaqU=
+github.com/livekit/protocol v1.46.7-0.20260605212020-c0615a2f6f84 h1:dkHHthyor9dwxxdBmbeG1ZUI4bPHpTEk9DjYJSSSIl4=
+github.com/livekit/protocol v1.46.7-0.20260605212020-c0615a2f6f84/go.mod h1:jO+y05AU9Ec4JswDyuzKCZ4bhziOS0CzMqgnbj60Dzs=
+github.com/livekit/psrpc v0.7.2 h1:6oZ+NODJ2pLyaT6VqDq1F4Qc/3TpDUSpyphj/P9MhQc=
+github.com/livekit/psrpc v0.7.2/go.mod h1:rAI+m2+/cb4x9RXhLRtUx5ZwdfjjXOl4zi46IjEetaw=
+github.com/livekit/server-sdk-go/v2 v2.16.6 h1:NBKw5l1AAOHsHAZKzuzAGzILRmSm+4E+/YZ9ZiaqudI=
+github.com/livekit/server-sdk-go/v2 v2.16.6/go.mod h1:1+duFCDFpAvHqZ6mHQe7IwjecLIBFv/keJcexuFhD+0=
 github.com/livekit/sipgo v0.13.2-0.20260519205735-a5b4a38b6ceb h1:HmgaJMGs0Nco/Z+XMc9f+xFgrbood9yJsIBtl1OY76M=
 github.com/livekit/sipgo v0.13.2-0.20260519205735-a5b4a38b6ceb/go.mod h1:aDa6mbFktNzA1D917RhFlIB5IOfNBTmrwt+/lX960j0=
 github.com/mackerelio/go-osstat v0.2.7 h1:TCavZi10wF49bT6iQZ9eT2keGZQpC69MTDfdJej5e94=

pkg/sip/media_codecs.go

@@ -35,11 +35,11 @@ var defaultCodecs = msdk.NewCodecSet()
 
 func init() {
 	defaultCodecs.SetEnabledMap(map[string]bool{
-		g711.ALawSDPName: true,
-		g711.ULawSDPName: true,
-		g722.SDPName:     true,
-		amrwb.SDPName:    false, // optional
-		dtmf.SDPName:     true,
+		g711.ALawSDPNameAndRate: true,
+		g711.ULawSDPNameAndRate: true,
+		g722.SDPNameAndRate:     true,
+		amrwb.SDPNameAndRate:    false, // optional
+		dtmf.SDPNameAndRate:     true,
 	})
 }
 
@@ -89,11 +89,11 @@ func codecSet(m *livekit.SIPMediaConfig) (*msdk.CodecSet, error) {
 		if rate == 0 {
 			// Set default rate
 			switch name {
-			case g711.ALawSDPName, g711.ULawSDPName:
+			case g711.ALawSDPNameOnly, g711.ULawSDPNameOnly:
 				rate = 8000
-			case g722.SDPName:
+			case g722.SDPNameOnly:
 				rate = 8000 // actually 16000, it's a know bug in the spec
-			case amrwb.SDPName:
+			case amrwb.SDPNameOnly:
 				rate = 16000
 			default:
 				return nil, fmt.Errorf("sample rate not specified for codec: %q", name)

pkg/sip/media_port.go

@@ -928,7 +928,7 @@ func (p *MediaPort) setupInput() {
 	if p.conf.Audio.DTMFType != 0 {
 		mux.Register(
 			p.conf.Audio.DTMFType, newRTPHandlerCount(
-				newRTPStatsHandler(p.mon, dtmf.SDPName, rtp.HandlerFunc(p.dtmfHandler)),
+				newRTPStatsHandler(p.mon, dtmf.SDPNameAndRate, rtp.HandlerFunc(p.dtmfHandler)),
 				&p.stats.DTMFPackets, &p.stats.DTMFBytes,
 			),
 		)

pkg/siptest/client.go

@@ -92,7 +92,7 @@ func NewClient(id string, conf ClientConfig) (*Client, error) {
 		conf.Number = "1000"
 	}
 	if conf.Codec == "" {
-		conf.Codec = g711.ULawSDPName
+		conf.Codec = g711.ULawSDPNameAndRate
 	}
 	codec := lksdp.CodecByName(conf.Codec).(msdk.AudioCodec)
 	cli := &Client{
@@ -572,7 +572,7 @@ func (c *Client) createOffer() ([]byte, error) {
 				},
 				Attributes: []sdp.Attribute{
 					{Key: "rtpmap", Value: fmt.Sprintf("%d %s", c.audioType, c.audioCodec.Info().SDPName)},
-					{Key: "rtpmap", Value: "101 " + dtmf.SDPName},
+					{Key: "rtpmap", Value: "101 " + dtmf.SDPNameAndRate},
 				},
 			},
 		},

test/client/main.go

@@ -39,7 +39,7 @@ var (
 	filePathPlay = flag.String("play", "audio.mkv", "play audio")
 	filePathSave = flag.String("save", "save.mkv", "save incoming audio to file")
 	sendDTMF     = flag.String("dtmf", "", "send DTMF sequence")
-	codec        = flag.String("codec", g711.ULawSDPName, "audio codec")
+	codec        = flag.String("codec", g711.ULawSDPNameAndRate, "audio codec")
 )
 
 func main() {

test/cloud/phone.go

@@ -13,7 +13,7 @@ import (
 
 const (
 	to    = 15550100000
-	codec = g711.ULawSDPName
+	codec = g711.ULawSDPNameAndRate
 )
 
 var num atomic.Int64

test/integration/sip_test.go

@@ -13,9 +13,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/livekit/protocol/tracer/jaeger"
 	"github.com/livekit/psrpc/pkg/middleware/otelpsrpc"
-	"github.com/stretchr/testify/require"
 
 	"github.com/livekit/media-sdk/dtmf"
 	"github.com/livekit/media-sdk/g711"
@@ -752,8 +753,8 @@ func TestSIPJoinRoomIndividual(t *testing.T) {
 
 func TestSIPAudio(t *testing.T) {
 	for _, codec := range []string{
-		g711.ULawSDPName,
-		g722.SDPName,
+		g711.ULawSDPNameAndRate,
+		g722.SDPNameAndRate,
 	} {
 		codec := codec
 		t.Run(codec, func(t *testing.T) {
@@ -787,7 +788,7 @@ func TestSIPAudio(t *testing.T) {
 						if i == 0 {
 							// Make first client always use the same codec.
 							// This way we can see how different codecs interact.
-							codec = g711.ULawSDPName
+							codec = g711.ULawSDPNameAndRate
 						}
 						wg.Add(1)
 						go func() {