mirror of
https://github.com/livekit/livekit.git
synced 2026-07-11 18:29:04 +00:00
Merge branch 'master' into duan/add-video-frame-caching
This commit is contained in:
@@ -208,7 +208,6 @@ type RoomConfig struct {
|
||||
EnableRemoteUnmute bool `yaml:"enable_remote_unmute,omitempty"`
|
||||
PlayoutDelay PlayoutDelayConfig `yaml:"playout_delay,omitempty"`
|
||||
SyncStreams bool `yaml:"sync_streams,omitempty"`
|
||||
CreateRoomEnabled bool `yaml:"create_room_enabled,omitempty"`
|
||||
CreateRoomTimeout time.Duration `yaml:"create_room_timeout,omitempty"`
|
||||
CreateRoomAttempts int `yaml:"create_room_attempts,omitempty"`
|
||||
// target room participant update batch chunk size in bytes
|
||||
@@ -434,7 +433,6 @@ var DefaultConfig = Config{
|
||||
},
|
||||
EmptyTimeout: 5 * 60,
|
||||
DepartureTimeout: 20,
|
||||
CreateRoomEnabled: true,
|
||||
CreateRoomTimeout: 10 * time.Second,
|
||||
CreateRoomAttempts: 3,
|
||||
UpdateBatchTargetSize: 128 * 1024,
|
||||
|
||||
@@ -330,6 +330,8 @@ func (f *Forwarder) MaybeExpireAcquireGrace() bool {
|
||||
return false
|
||||
}
|
||||
f.acquireDeadline = 0
|
||||
f.enableStartAtDesiredQuality = false
|
||||
f.vls.SetEnableStartAtDesiredQuality(false)
|
||||
return !f.vls.GetCurrent().IsValid()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user