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

remove deprecated functions.

Browse Source
This commit is contained in:
Miroslav Šedivý 2023-04-10 21:47:22 +02:00
parent 9d362ed036
commit 5f0aafca51
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/webrtc/manager.go
View File

@ -360,22 +360,6 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, bitrate int,
rtcpChannel: videoRtcp, rtcpChannel: videoRtcp,
// config // config
iceTrickle: manager.config.ICETrickle, iceTrickle: manager.config.ICETrickle,
// deprecated functions
videoId: videoTrack.stream.ID,
setPaused: func(isPaused bool) {
videoTrack.SetPaused(isPaused)
audioTrack.SetPaused(isPaused)
},
setVideoAuto: func(videoAuto bool) {
// if estimator is enabled and not in passive mode, enable video auto bitrate
if manager.config.EstimatorEnabled && !manager.config.EstimatorPassive {
videoTrack.SetVideoAuto(videoAuto)
} else {
logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto")
videoTrack.SetVideoAuto(false) // ensure video auto is disabled
}
},
getVideoAuto: videoTrack.VideoAuto,
} }
manager.logger.Info(). manager.logger.Info().

24
internal/webrtc/peer.go
View File

@ -30,11 +30,6 @@ type WebRTCPeerCtx struct {
rtcpChannel chan []rtcp.Packet rtcpChannel chan []rtcp.Packet
// config // config
iceTrickle bool iceTrickle bool
// deprecated functions
videoId func() string
setPaused func(isPaused bool)
setVideoAuto func(auto bool)
getVideoAuto func() bool
} }
func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) { func (peer *WebRTCPeerCtx) CreateOffer(ICERestart bool) (*webrtc.SessionDescription, error) {
@ -185,12 +180,12 @@ func (peer *WebRTCPeerCtx) SetVideoID(videoID string) error {
return nil return nil
} }
// TODO: Refactor.
func (peer *WebRTCPeerCtx) GetVideoID() string { func (peer *WebRTCPeerCtx) GetVideoID() string {
peer.mu.Lock() peer.mu.Lock()
defer peer.mu.Unlock() defer peer.mu.Unlock()
return peer.videoId() // TODO: Refactor.
return peer.videoTrack.stream.ID()
} }
func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error { func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error {
@ -198,7 +193,8 @@ func (peer *WebRTCPeerCtx) SetPaused(isPaused bool) error {
defer peer.mu.Unlock() defer peer.mu.Unlock()
peer.logger.Info().Bool("is_paused", isPaused).Msg("set paused") peer.logger.Info().Bool("is_paused", isPaused).Msg("set paused")
peer.setPaused(isPaused) peer.videoTrack.SetPaused(isPaused)
peer.audioTrack.SetPaused(isPaused)
return nil return nil
} }
@ -262,10 +258,16 @@ func (peer *WebRTCPeerCtx) Destroy() {
} }
} }
func (peer *WebRTCPeerCtx) SetVideoAuto(auto bool) { func (peer *WebRTCPeerCtx) SetVideoAuto(videoAuto bool) {
peer.setVideoAuto(auto) // if estimator is enabled, enable video auto bitrate
if peer.estimator != nil {
peer.videoTrack.SetVideoAuto(videoAuto)
} else {
peer.logger.Warn().Msg("estimator is disabled or in passive mode, cannot change video auto")
peer.videoTrack.SetVideoAuto(false) // ensure video auto is disabled
}
} }
func (peer *WebRTCPeerCtx) VideoAuto() bool { func (peer *WebRTCPeerCtx) VideoAuto() bool {
return peer.getVideoAuto() return peer.videoTrack.VideoAuto()
} }