3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-08-04 09:19:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Capture bandwidth switch (#14)

Browse source 
* Handle bitrate change by finding the stream with closest bitrate as peer

* Convert video id into bitrate when creating peer or changing bitrate

* Try to fix prometheus panic

* Revert metrics label name change

* minor fixes.

* bitrate selector.

* skip if moving to the same stream.

* no closure for getting target bitrate.

* fix: high res switch to lo video, stream bitrate out of range

* revert dev config change.

* white space.

Co-authored-by: Aleksandar Sukovic <aleksandar.sukovic@gmail.com>
This commit is contained in:
Miroslav Šedivý 2022-10-25 20:25:00 +02:00 • committed by GitHub
parent e0bee67e85
commit 6067367acd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 186 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/webrtc/manager.go
View file

@ -214,7 +214,7 @@ func (manager *WebRTCManagerCtx) newPeerConnection(codecs []codec.RTPCodec, logg
return api.NewPeerConnection(manager.webrtcConfiguration)
}
func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID string) (*webrtc.SessionDescription, error) {
func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int) (*webrtc.SessionDescription, error) {
id := atomic.AddInt32(&manager.peerId, 1)
manager.metrics.NewConnection(session)
@ -280,11 +280,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin
return nil, err
}
// set default video id
err = videoTrack.SetVideoID(videoID)
if err != nil {
// set initial video bitrate
if err = videoTrack.SetBitrate(bitrate); err != nil {
return nil, err
}
videoID := videoTrack.stream.ID()
manager.metrics.SetVideoID(session, videoID)
// data channel
@ -298,14 +299,19 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin
logger: logger,
connection: connection,
dataChannel: dataChannel,
changeVideo: func(videoID string) error {
if err := videoTrack.SetVideoID(videoID); err != nil {
changeVideo: func(bitrate int) error {
if err := videoTrack.SetBitrate(bitrate); err != nil {
return err
}
videoID := videoTrack.stream.ID()
manager.metrics.SetVideoID(session, videoID)
return nil
},
// TODO: Refactor.
videoId: func() string {
return videoTrack.stream.ID()
},
setPaused: func(isPaused bool) {
videoTrack.SetPaused(isPaused)
audioTrack.SetPaused(isPaused)
@ -418,7 +424,9 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin
connection.Close()
case webrtc.PeerConnectionStateClosed:
session.SetWebRTCConnected(peer, false)
video.RemoveReceiver(videoTrack)
if err = video.RemoveReceiver(videoTrack); err != nil {
logger.Err(err).Msg("failed to remove video receiver")
}
audioTrack.RemoveStream()
}

17
internal/webrtc/peer.go
View file

@ -17,7 +17,8 @@ type WebRTCPeerCtx struct {
logger zerolog.Logger
connection *webrtc.PeerConnection
dataChannel *webrtc.DataChannel
changeVideo func(videoID string) error
changeVideo func(bitrate int) error
videoId func() string
setPaused func(isPaused bool)
iceTrickle bool
}
@ -114,7 +115,7 @@ func (peer *WebRTCPeerCtx) SetCandidate(candidate webrtc.ICECandidateInit) error
return peer.connection.AddICECandidate(candidate)
}
func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error {
func (peer *WebRTCPeerCtx) SetVideoBitrate(bitrate int) error {
peer.mu.Lock()
defer peer.mu.Unlock()
@ -122,8 +123,16 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error {
return types.ErrWebRTCConnectionNotFound
}
peer.logger.Info().Str("video_id", videoID).Msg("change video id")
return peer.changeVideo(videoID)
peer.logger.Info().Int("bitrate", bitrate).Msg("change video bitrate")
return peer.changeVideo(bitrate)
}
// TODO: Refactor.
func (peer *WebRTCPeerCtx) GetVideoId() string {
peer.mu.Lock()
defer peer.mu.Unlock()
return peer.videoId()
}
func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error {

14
internal/webrtc/track.go
View file

@ -27,7 +27,7 @@ type Track struct {
onRtcp func(rtcp.Packet)
onRtcpMu sync.RWMutex
videoIdChange func(string) error
bitrateChange func(int) error
}
func NewTrack(logger zerolog.Logger, codec codec.RTPCodec, connection *webrtc.PeerConnection) (*Track, error) {
@ -140,14 +140,14 @@ func (t *Track) OnRTCP(f func(rtcp.Packet)) {
t.onRtcp = f
}
func (t *Track) SetVideoID(videoID string) error {
if t.videoIdChange == nil {
return fmt.Errorf("video id change not supported")
func (t *Track) SetBitrate(bitrate int) error {
if t.bitrateChange == nil {
return fmt.Errorf("bitrate change not supported")
}
return t.videoIdChange(videoID)
return t.bitrateChange(bitrate)
}
func (t *Track) OnVideoIdChange(f func(string) error) {
t.videoIdChange = f
func (t *Track) OnBitrateChange(f func(int) error) {
t.bitrateChange = f
}