Skip to content

Support PCMU and PCMA room codecs #700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dennwc wants to merge 2 commits into
base: main
Choose a base branch
from
+56 −9
Open

Support PCMU and PCMA room codecs #700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7999ca2
Support PCMU and PCMA room codecs.
dennwc May 25, 2026
afb894c
Ignore WebRTC debug logs.
dennwc May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 56 additions & 9 deletions pkg/sip/room.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"context"
"io"
"math"
"strings"
"sync"
"sync/atomic"
"time"
Expand All @@ -28,11 +29,11 @@ import (

msdk "github.com/livekit/media-sdk"
"github.com/livekit/media-sdk/dtmf"
"github.com/livekit/media-sdk/g711"
"github.com/livekit/media-sdk/jitter"
"github.com/livekit/media-sdk/rtp"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/logger"
"github.com/livekit/protocol/logger/medialogutils"
"github.com/livekit/protocol/sip"
lksdk "github.com/livekit/server-sdk-go/v2"

Expand Down Expand Up @@ -361,14 +362,29 @@ func (r *Room) Connect(ctx context.Context, conf *config.Config, rconf RoomConfi
}
}

codec, err := opus.Decode(out, channels, log)
if err != nil {
log.Errorw("cannot create opus decoder", err)
codec := track.Codec()
var rh rtp.Handler
switch strings.ToLower(codec.MimeType) {
case "opus":
cw, err := opus.Decode(out, channels, log)
if err != nil {
log.Errorw("cannot create opus decoder", err)
return
}
defer cw.Close()

rh = rtp.NewMediaStreamIn(cw)
case "pcmu":
cw := g711.DecodeULaw(out)
rh = rtp.NewMediaStreamIn(cw)
case "pcma":
cw := g711.DecodeALaw(out)
rh = rtp.NewMediaStreamIn(cw)
Copy link
Copy Markdown
Contributor

@alexlivekit alexlivekit May 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: This, rh = rtp.NewMediaStreamIn(cw), can be taken out of the switch, right?

default:
log.Warnw("unsupported sip room codec", nil, "codec", codec.MimeType)
return
}
defer codec.Close()

h := rtp.NewNopCloser(rtp.NewMediaStreamIn(codec))
h := rtp.NewNopCloser(rh)
if conf.EnableJitterBuffer {
h = rtp.HandleJitter(h, jitter.WithPacketLossHandler(func(packetsLost, packetsDropped uint64) {
r.stats.JitterBufferPacketsLost.Store(packetsLost)
Expand All @@ -378,7 +394,7 @@ func (r *Room) Connect(ctx context.Context, conf *config.Config, rconf RoomConfi

h = newRTPStreamStats(h, &r.stats.rtpStats)
h = newLatencyRTPEntry(h, &outRecvLatencyEntry)
err = rtp.HandleLoop(track, h)
err := rtp.HandleLoop(track, h)
if err != nil && !errors.Is(err, io.EOF) {
log.Infow("room track rtp handler returned with failure", "error", err)
}
Expand Down Expand Up @@ -434,7 +450,7 @@ func (r *Room) Connect(ctx context.Context, conf *config.Config, rconf RoomConfi
}
}
room := lksdk.NewRoom(roomCallback)
room.SetLogger(medialogutils.NewOverrideLogger(r.log))
room.SetLogger(newRoomOverrideLogger(r.log))
err := room.JoinWithContextAndToken(ctx, rconf.WsUrl, rconf.Token,
lksdk.WithAutoSubscribe(false),
lksdk.WithExtraAttributes(partConf.Attributes),
Expand Down Expand Up @@ -590,3 +606,34 @@ func (r *Room) NewTrack() *mixer.Input {
}
return r.mix.NewInput()
}

// roomOverrideLogger converts errors to warnings and ignore debug
type roomOverrideLogger struct {
logger.Logger
}

func newRoomOverrideLogger(l logger.Logger) *roomOverrideLogger {
if l == nil {
l = logger.GetLogger()
}

return &roomOverrideLogger{
Logger: l.WithCallDepth(1),
}
}

func (l *roomOverrideLogger) Debugw(msg string, keysAndValues ...interface{}) {
// ignore
}

func (l *roomOverrideLogger) Infow(msg string, keysAndValues ...interface{}) {
l.Logger.Infow(msg, keysAndValues...)
}

func (l *roomOverrideLogger) Warnw(msg string, err error, keysAndValues ...interface{}) {
l.Logger.Warnw(msg, err, keysAndValues...)
}

func (l *roomOverrideLogger) Errorw(msg string, err error, keysAndValues ...interface{}) {
l.Logger.Warnw(msg, err, keysAndValues...)
}
Loading