Skip to content

Check for closed receiver before setting up rid #3290

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
boks1971 wants to merge 3 commits into
base: master
Choose a base branch
from
+33 −6
Open

Check for closed receiver before setting up rid #3290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29bf0af
Check for closed receiver before setting up rid
boks1971 Dec 5, 2025
d524fcf
Merge remote-tracking branch 'origin/master' into raja_closed_receiver
boks1971 Dec 5, 2025
ec33334
Merge remote-tracking branch 'origin/master' into raja_closed_receiver
boks1971 Dec 9, 2025
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
3 changes: 0 additions & 3 deletions peerconnection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,9 +1875,6 @@ func (pc *PeerConnection) handleIncomingSSRC(rtpStream *srtp.ReadStreamSRTP, ssr
}

if rsid != "" {
receiver.mu.Lock()
Copy link
Member

@Sean-Der Sean-Der Dec 5, 2025

Choose a reason for hiding this comment

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

If you use the atomic do you still need locking changes?

Copy link
Contributor Author

@boks1971 boks1971 Dec 5, 2025

Choose a reason for hiding this comment

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

Yeah, I just moved the lock inside. Yeah, there are more internal state like tracks in RTPReceiver which needs locking. Not sure why the lock was not internal and called from peerconnection.go. Seemed like a good thing to move it inside.

defer receiver.mu.Unlock()

return receiver.receiveForRtx(SSRC(0), rsid, streamInfo, readStream, interceptor, rtcpReadStream, rtcpInterceptor)
}

Expand Down
36 changes: 33 additions & 3 deletions rtpreceiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func (r *RTPReceiver) startReceive(parameters RTPReceiveParameters) error { //no
rtcpReadStream := result.rtcpReadStream
rtcpInterceptor := result.rtcpInterceptor

if err = r.receiveForRtx(
if err = r.receiveForRtxInternal(
rtxSsrc,
"",
streamInfo,
Expand Down Expand Up @@ -552,6 +552,10 @@ func (r *RTPReceiver) receiveForRid(
r.mu.Lock()
defer r.mu.Unlock()

if r.haveClosed() {
return nil, io.EOF
}

for i := range r.tracks {
if r.tracks[i].track.RID() == rid {
r.tracks[i].track.mu.Lock()
Expand All @@ -576,8 +580,6 @@ func (r *RTPReceiver) receiveForRid(
}

// receiveForRtx starts a routine that processes the repair stream.
//
//nolint:cyclop
func (r *RTPReceiver) receiveForRtx(
ssrc SSRC,
rsid string,
Expand All @@ -587,6 +589,34 @@ func (r *RTPReceiver) receiveForRtx(
rtcpReadStream *srtp.ReadStreamSRTCP,
rtcpInterceptor interceptor.RTCPReader,
) error {
r.mu.Lock()
Copy link
Member

@Sean-Der Sean-Der Dec 5, 2025

Choose a reason for hiding this comment

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

Can you use haveClosed instead?

defer r.mu.Unlock()

return r.receiveForRtxInternal(
ssrc,
rsid,
streamInfo,
rtpReadStream,
rtpInterceptor,
rtcpReadStream,
rtcpInterceptor,
)
}

//nolint:gocognit,cyclop
func (r *RTPReceiver) receiveForRtxInternal(
ssrc SSRC,
rsid string,
streamInfo *interceptor.StreamInfo,
rtpReadStream *srtp.ReadStreamSRTP,
rtpInterceptor interceptor.RTPReader,
rtcpReadStream *srtp.ReadStreamSRTCP,
rtcpInterceptor interceptor.RTCPReader,
) error {
if r.haveClosed() {
return io.EOF
}

var track *trackStreams
if ssrc != 0 && len(r.tracks) == 1 {
track = &r.tracks[0]
Expand Down
Loading