Skip to content

Register response receiver before sending request. #557

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
boks1971 merged 1 commit into from
Nov 13, 2024
Merged

Register response receiver before sending request. #557

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
18 changes: 8 additions & 10 deletions localparticipant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ func (p *LocalParticipant) PublishTrack(track webrtc.TrackLocal, opts *TrackPubl
return nil, ErrNoPeerConnection
}

pubChan := make(chan *livekit.TrackPublishedResponse, 1)
p.engine.RegisterTrackPublishedListener(track.ID(), pubChan)
defer p.engine.UnregisterTrackPublishedListener(track.ID())

pub := NewLocalTrackPublication(kind, track, *opts, p.engine.client)
pub.onMuteChanged = p.onTrackMuted

Expand Down Expand Up @@ -107,19 +111,14 @@ func (p *LocalParticipant) PublishTrack(track webrtc.TrackLocal, opts *TrackPubl

publisher.Negotiate()

pubChan := make(chan *livekit.TrackPublishedResponse, 1)
p.engine.RegisterTrackPublishedListener(track.ID(), pubChan)

var pubRes *livekit.TrackPublishedResponse
select {
case pubRes = <-pubChan:
break
case <-time.After(trackPublishTimeout):
p.engine.UnregisterTrackPublishedListener(track.ID())
return nil, ErrTrackPublishTimeout
}

p.engine.UnregisterTrackPublishedListener(track.ID())
pub.updateInfo(pubRes.Track)
p.addPublication(pub)

Expand Down Expand Up @@ -163,6 +162,10 @@ func (p *LocalParticipant) PublishSimulcastTrack(tracks []*LocalTrack, opts *Tra

mainTrack := tracksCopy[len(tracksCopy)-1]

pubChan := make(chan *livekit.TrackPublishedResponse, 1)
p.engine.RegisterTrackPublishedListener(mainTrack.ID(), pubChan)
defer p.engine.UnregisterTrackPublishedListener(mainTrack.ID())

pub := NewLocalTrackPublication(KindFromRTPType(mainTrack.Kind()), nil, *opts, p.engine.client)
pub.onMuteChanged = p.onTrackMuted

Expand Down Expand Up @@ -193,19 +196,14 @@ func (p *LocalParticipant) PublishSimulcastTrack(tracks []*LocalTrack, opts *Tra
return nil, err
}

pubChan := make(chan *livekit.TrackPublishedResponse, 1)
p.engine.RegisterTrackPublishedListener(mainTrack.ID(), pubChan)

var pubRes *livekit.TrackPublishedResponse
select {
case pubRes = <-pubChan:
break
case <-time.After(trackPublishTimeout):
p.engine.UnregisterTrackPublishedListener(mainTrack.ID())
return nil, ErrTrackPublishTimeout
}

p.engine.UnregisterTrackPublishedListener(mainTrack.ID())
publisher, ok := p.engine.Publisher()
if !ok {
return nil, ErrNoPeerConnection
Expand Down