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

choose video with CreatePeer.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-02-07 17:07:55 +01:00
parent 5cdb6e074e
commit dd2ca03955
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/types/message/messages.go
View File

@ -46,6 +46,7 @@ type SignalProvide struct {
Lite bool `json:"lite"`
ICE []string `json:"ice"`
Videos []string `json:"videos"`
Video string `json:"video"`
}
type SignalCandidate struct {

2
internal/types/webrtc.go
View File

@ -17,5 +17,5 @@ type WebRTCManager interface {
ICELite() bool
ICEServers() []string
CreatePeer(session Session) (*webrtc.SessionDescription, error)
CreatePeer(session Session, videoID string) (*webrtc.SessionDescription, error)
}

45
internal/webrtc/manager.go
View File

@ -19,23 +19,21 @@ import (
func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx {
return &WebRTCManagerCtx{
logger: log.With().Str("module", "webrtc").Logger(),
defaultVideoID: capture.VideoIDs()[0],
desktop: desktop,
capture: capture,
config: config,
logger: log.With().Str("module", "webrtc").Logger(),
desktop: desktop,
capture: capture,
config: config,
}
}
type WebRTCManagerCtx struct {
logger zerolog.Logger
audioTrack *webrtc.TrackLocalStaticSample
unsubscribe []func()
defaultVideoID string
audioCodec codec.RTPCodec
desktop types.DesktopManager
capture types.CaptureManager
config *config.WebRTC
logger zerolog.Logger
audioTrack *webrtc.TrackLocalStaticSample
audioCodec codec.RTPCodec
audioStop func()
desktop types.DesktopManager
capture types.CaptureManager
config *config.WebRTC
}
func (manager *WebRTCManagerCtx) Start() {
@ -55,9 +53,9 @@ func (manager *WebRTCManagerCtx) Start() {
}
audio.AddListener(&listener)
manager.unsubscribe = append(manager.unsubscribe, func(){
manager.audioStop = func(){
audio.RemoveListener(&listener)
})
}
manager.logger.Info().
Str("ice_lite", fmt.Sprintf("%t", manager.config.ICELite)).
@ -71,10 +69,7 @@ func (manager *WebRTCManagerCtx) Start() {
func (manager *WebRTCManagerCtx) Shutdown() error {
manager.logger.Info().Msgf("webrtc shutting down")
for _, unsubscribe := range manager.unsubscribe {
unsubscribe()
}
manager.audioStop()
return nil
}
@ -86,11 +81,11 @@ func (manager *WebRTCManagerCtx) ICEServers() []string {
return manager.config.ICEServers
}
func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.SessionDescription, error) {
func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) {
logger := manager.logger.With().Str("id", session.ID()).Logger()
// Create MediaEngine
engine, err := manager.mediaEngine()
engine, err := manager.mediaEngine(videoID)
if err != nil {
return nil, err
}
@ -129,9 +124,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess
}
// create video track
videoStream, ok := manager.capture.Video(manager.defaultVideoID)
videoStream, ok := manager.capture.Video(videoID)
if !ok {
manager.logger.Warn().Str("videoID", manager.defaultVideoID).Msg("default video stream not found")
manager.logger.Warn().Str("videoID", videoID).Msg("video stream not found")
return nil, err
}
@ -265,11 +260,11 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session) (*webrtc.Sess
return connection.LocalDescription(), nil
}
func (manager *WebRTCManagerCtx) mediaEngine() (*webrtc.MediaEngine, error) {
func (manager *WebRTCManagerCtx) mediaEngine(videoID string) (*webrtc.MediaEngine, error) {
engine := &webrtc.MediaEngine{}
// all videos must have the same codec
video, ok := manager.capture.Video(manager.defaultVideoID)
video, ok := manager.capture.Video(videoID)
if !ok {
return nil, fmt.Errorf("default video track not found")
}

8
internal/websocket/handler/signal.go
View File

@ -11,7 +11,10 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error {
return nil
}
offer, err := h.webrtc.CreatePeer(session)
videos := h.capture.VideoIDs()
defaultVideo := videos[0]
offer, err := h.webrtc.CreatePeer(session, defaultVideo)
if err != nil {
return err
}
@ -22,7 +25,8 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error {
SDP: offer.SDP,
Lite: h.webrtc.ICELite(),
ICE: h.webrtc.ICEServers(),
Videos: h.capture.VideoIDs(),
Videos: videos,
Video: defaultVideo,
})
}