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

fixes "Fast changing screen size crashes neko".

Browse Source
This commit is contained in:
Miroslav Šedivý 2020-11-13 22:22:44 +01:00
parent 9c26f35c76
commit bd45e81afe
1 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
internal/capture/manager.go
View File

@ -16,8 +16,10 @@ type CaptureManagerCtx struct {
audio *gst.Pipeline audio *gst.Pipeline
broadcast *gst.Pipeline broadcast *gst.Pipeline
config *config.Capture config *config.Capture
audio_emit_stop chan bool emit_update chan bool
video_emit_stop chan bool emit_stop chan bool
video_sample chan types.Sample
audio_sample chan types.Sample
emmiter events.EventEmmiter emmiter events.EventEmmiter
streaming bool streaming bool
broadcasting bool broadcasting bool
@ -28,8 +30,8 @@ type CaptureManagerCtx struct {
func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx { func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx {
return &CaptureManagerCtx{ return &CaptureManagerCtx{
logger: log.With().Str("module", "capture").Logger(), logger: log.With().Str("module", "capture").Logger(),
audio_emit_stop: make(chan bool), emit_update: make(chan bool),
video_emit_stop: make(chan bool), emit_stop: make(chan bool),
emmiter: events.New(), emmiter: events.New(),
config: config, config: config,
streaming: false, streaming: false,
@ -51,10 +53,29 @@ func (manager *CaptureManagerCtx) Start() {
manager.createVideoPipeline() manager.createVideoPipeline()
manager.StartBroadcastPipeline() manager.StartBroadcastPipeline()
}) })
go func() {
manager.logger.Debug().Msg("started emitting samples")
for {
select {
case <-manager.emit_stop:
manager.logger.Debug().Msg("stopped emitting samples")
return
case <-manager.emit_update:
manager.logger.Debug().Msg("update emitting samples")
case sample := <-manager.video_sample:
manager.emmiter.Emit("video", sample)
case sample := <-manager.audio_sample:
manager.emmiter.Emit("audio", sample)
}
}
}()
} }
func (manager *CaptureManagerCtx) Shutdown() error { func (manager *CaptureManagerCtx) Shutdown() error {
manager.logger.Info().Msgf("capture shutting down") manager.logger.Info().Msgf("capture shutting down")
manager.emit_stop <- true
manager.StopStream() manager.StopStream()
return nil return nil
} }
@ -124,23 +145,11 @@ func (manager *CaptureManagerCtx) createVideoPipeline() {
manager.video.Start() manager.video.Start()
go func() { manager.video_sample = manager.video.Sample
manager.logger.Debug().Msg("started emitting video samples") manager.emit_update <-true
for {
select {
case <-manager.video_emit_stop:
manager.logger.Debug().Msg("stopped emitting video samples")
return
case sample := <-manager.video.Sample:
manager.emmiter.Emit("video", sample)
}
}
}()
} }
func (manager *CaptureManagerCtx) destroyVideoPipeline() { func (manager *CaptureManagerCtx) destroyVideoPipeline() {
manager.video_emit_stop <- true
manager.logger.Info().Msgf("stopping video pipeline") manager.logger.Info().Msgf("stopping video pipeline")
manager.video.Stop() manager.video.Stop()
} }
@ -170,23 +179,11 @@ func (manager *CaptureManagerCtx) createAudioPipeline() {
manager.audio.Start() manager.audio.Start()
go func() { manager.audio_sample = manager.audio.Sample
manager.logger.Debug().Msg("started emitting audio samples") manager.emit_update <-true
for {
select {
case <-manager.audio_emit_stop:
manager.logger.Debug().Msg("stopped emitting audio samples")
return
case sample := <-manager.audio.Sample:
manager.emmiter.Emit("audio", sample)
}
}
}()
} }
func (manager *CaptureManagerCtx) destroyAudioPipeline() { func (manager *CaptureManagerCtx) destroyAudioPipeline() {
manager.audio_emit_stop <- true
manager.logger.Info().Msgf("stopping audio pipeline") manager.logger.Info().Msgf("stopping audio pipeline")
manager.audio.Stop() manager.audio.Stop()
} }