Skip to content

Fix double close of inbound audio writer. #804

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

Merged
alexfish8 merged 1 commit into from
Aug 21, 2026
+9 −1
Merged

Fix double close of inbound audio writer. #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion pkg/sip/media_port.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,14 @@ type MediaPort interface {
GetOutboundDTMFWriter() msdk.WriteCloser[*livekit.SipDTMF]

// WriteInboundAudioTo tells port where to write inbound SIP audio.
//
// MediaPort.Close() will propagate to the argument writer. The caller is
// responsible for closing the returned media writer.
WriteInboundAudioTo(w msdk.PCM16Writer) msdk.PCM16Writer

// WriteInboundDTMFTo tells port where to write inbound SIP DTMF.
//
// Has similar close semantics to WriteInboundAudioTo (see comment above).
WriteInboundDTMFTo(w msdk.WriteCloser[*livekit.SipDTMF]) msdk.WriteCloser[*livekit.SipDTMF]

// If there is no offer, this generates an offer.
Expand Down Expand Up @@ -735,7 +741,6 @@ func (p *mediaPort) GetOutboundAudioWriter() msdk.PCM16Writer {
return p.audioOut
}

// WriteInboundAudioTo sets audio writer that will receive decoded PCM from incoming RTP packets.
func (p *mediaPort) WriteInboundAudioTo(w msdk.PCM16Writer) msdk.PCM16Writer {
return p.audioIn.Swap(w)
}
Expand Down
3 changes: 3 additions & 0 deletions pkg/sip/outbound.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,9 @@ func (c *outboundCall) connectMedia() {
old.Close()
c.log.Warnw("media port has unexpected inbound audio writer", nil)
}
// WriteInboundAudioTo takes ownership of c.lkRoomIn, so nil it out to avoid
// double-closing later.
c.lkRoomIn = nil

if old := c.media.WriteInboundDTMFTo(c.lkRoom.GetInboundDTMFWriter()); old != nil {
old.Close()
Expand Down