iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

unsubscribe listeners on shutdown.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-02-06 12:59:57 +01:00
parent f05889bd56
commit 5d66dcdb7b
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
internal/webrtc/manager.go
View File

@ -31,6 +31,7 @@ type WebRTCManagerCtx struct {
logger zerolog.Logger logger zerolog.Logger
videoTracks map[string]*webrtc.TrackLocalStaticSample videoTracks map[string]*webrtc.TrackLocalStaticSample
audioTrack *webrtc.TrackLocalStaticSample audioTrack *webrtc.TrackLocalStaticSample
unsubscribe []func()
defaultVideoID string defaultVideoID string
audioCodec codec.RTPCodec audioCodec codec.RTPCodec
desktop types.DesktopManager desktop types.DesktopManager
@ -48,10 +49,15 @@ func (manager *WebRTCManagerCtx) Start() {
manager.logger.Panic().Err(err).Msg("unable to create audio track") manager.logger.Panic().Err(err).Msg("unable to create audio track")
} }
audio.AddListener(func(sample types.Sample) { listener := func(sample types.Sample) {
if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { if err := manager.audioTrack.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe {
manager.logger.Warn().Err(err).Msg("audio pipeline failed to write") manager.logger.Warn().Err(err).Msg("audio pipeline failed to write")
} }
}
audio.AddListener(listener)
manager.unsubscribe = append(manager.unsubscribe, func(){
audio.RemoveListener(listener)
}) })
videoIDs := manager.capture.VideoIDs() videoIDs := manager.capture.VideoIDs()
@ -69,11 +75,16 @@ func (manager *WebRTCManagerCtx) Start() {
if err != nil { if err != nil {
manager.logger.Panic().Err(err).Str("videoID", videoID).Msg("unable to create video track") manager.logger.Panic().Err(err).Str("videoID", videoID).Msg("unable to create video track")
} }
video.AddListener(func(sample types.Sample) { listener := func(sample types.Sample) {
if err := track.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe { if err := track.WriteSample(media.Sample(sample)); err != nil && err != io.ErrClosedPipe {
manager.logger.Warn().Err(err).Str("videoID", videoID).Msg("vide pipeline failed to write") manager.logger.Warn().Err(err).Str("videoID", videoID).Msg("vide pipeline failed to write")
} }
}
video.AddListener(listener)
manager.unsubscribe = append(manager.unsubscribe, func(){
video.RemoveListener(listener)
}) })
manager.videoTracks[videoID] = track manager.videoTracks[videoID] = track
@ -90,6 +101,11 @@ func (manager *WebRTCManagerCtx) Start() {
func (manager *WebRTCManagerCtx) Shutdown() error { func (manager *WebRTCManagerCtx) Shutdown() error {
manager.logger.Info().Msgf("webrtc shutting down") manager.logger.Info().Msgf("webrtc shutting down")
for _, unsubscribe := range manager.unsubscribe {
unsubscribe()
}
return nil return nil
} }