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

add Video error return.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-02-05 18:07:58 +01:00
parent f62d36ac4f
commit 761f6d8a8f
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/capture/manager.go
View File

@ -168,8 +168,9 @@ func (manager *CaptureManagerCtx) Audio() types.StreamManager {
return manager.audio return manager.audio
} }
func (manager *CaptureManagerCtx) Video(videoID string) types.StreamManager { func (manager *CaptureManagerCtx) Video(videoID string) (types.StreamManager, bool) {
return manager.videos[videoID] video, ok := manager.videos[videoID]
return video, ok
} }
func (manager *CaptureManagerCtx) VideoIDs() []string { func (manager *CaptureManagerCtx) VideoIDs() []string {

2
internal/types/capture.go
View File

@ -37,7 +37,7 @@ type CaptureManager interface {
Broadcast() BroadcastManager Broadcast() BroadcastManager
Screencast() ScreencastManager Screencast() ScreencastManager
Audio() StreamManager Audio() StreamManager
Video(videoID string) StreamManager Video(videoID string) (StreamManager, bool)
VideoIDs() []string VideoIDs() []string
StartStream() StartStream()

13
internal/webrtc/manager.go
View File

@ -57,7 +57,11 @@ func (manager *WebRTCManagerCtx) Start() {
videoIDs := manager.capture.VideoIDs() videoIDs := manager.capture.VideoIDs()
manager.videoTracks = map[string]*webrtc.TrackLocalStaticSample{} manager.videoTracks = map[string]*webrtc.TrackLocalStaticSample{}
for _, videoID := range videoIDs { for _, videoID := range videoIDs {
video := manager.capture.Video(videoID) video, ok := manager.capture.Video(videoID)
if !ok {
manager.logger.Warn().Str("videoID", videoID).Msg("video stream not found, skipping")
continue
}
track, err := webrtc.NewTrackLocalStaticSample(video.Codec().Capability, "video", "stream") track, err := webrtc.NewTrackLocalStaticSample(video.Codec().Capability, "video", "stream")
if err != nil { if err != nil {
@ -218,7 +222,12 @@ func (manager *WebRTCManagerCtx) mediaEngine() (*webrtc.MediaEngine, error) {
engine := &webrtc.MediaEngine{} engine := &webrtc.MediaEngine{}
// all videos must have the same codec // all videos must have the same codec
videoCodec := manager.capture.Video(manager.defaultVideoID).Codec() video, ok := manager.capture.Video(manager.defaultVideoID)
if !ok {
return nil, fmt.Errorf("default video track not found")
}
videoCodec := video.Codec()
if err := videoCodec.Register(engine); err != nil { if err := videoCodec.Register(engine); err != nil {
return nil, err return nil, err
} }