Fix v1.9.8 merge problems

Author: pabloFuente

pkg/rtc/types/interfaces.go

@@ -480,16 +480,6 @@ type LocalParticipant interface {
 
 	AddOnClose(key string, callback func(LocalParticipant))
 	OnClaimsChanged(callback func(LocalParticipant))
-	OnUpdateSubscriptions(func(
-		LocalParticipant,
-		[]livekit.TrackID,
-		[]*livekit.ParticipantTracks,
-		bool,
-	))
-	OnUpdateSubscriptionPermission(func(LocalParticipant, *livekit.SubscriptionPermission) error)
-	OnSyncState(func(LocalParticipant, *livekit.SyncState) error)
-	OnSimulateScenario(func(LocalParticipant, *livekit.SimulateScenario) error)
-	OnLeave(func(LocalParticipant, ParticipantCloseReason))
 
 	HandleReceiverReport(dt *sfu.DownTrack, report *rtcp.ReceiverReport)
 

pkg/service/roommanager.go

@@ -74,7 +74,6 @@ type RoomManager struct {
 	whipServer        rpc.WHIPServer[livekit.NodeID]
 	roomStore         ObjectStore
 	telemetry         telemetry.TelemetryService
-	recorder          observability.Reporter
 	clientConfManager clientconfiguration.ClientConfigurationManager
 	agentClient       agent.Client
 	agentStore        AgentStore

pkg/service/wire_gen.go

@@ -93,12 +93,6 @@ type VideoSize struct {
 	Height uint32
 }
 
-// VideoSize represents video resolution
-type VideoSize struct {
-	Width  uint32
-	Height uint32
-}
-
 // Buffer contains all packets
 type Buffer struct {
 	sync.RWMutex

pkg/sfu/buffer/buffer.go

@@ -28,14 +28,6 @@ import (
 	"github.com/livekit/protocol/logger"
 )
 
-const (
-	ddRestartThreshold = 30 * time.Second
-
-	// frame integrity check 2 seconds for L3T3 30fps video
-	integrityCheckFrame = 180
-	integrityCheckPkt   = 1024
-)
-
 var (
 	ExtDependencyDescriptorFactory = &sync.Pool{
 		New: func() any {
@@ -121,16 +113,6 @@ func (r *DependencyDescriptorParser) Parse(pkt *rtp.Packet) (*ExtDependencyDescr
 		return nil, videoLayer, ErrDDExtentionNotFound
 	}
 
-	var restart bool
-	if r.enableRestart {
-		if !r.lastPacketAt.IsZero() && time.Since(r.lastPacketAt) > ddRestartThreshold {
-			r.restart()
-			restart = true
-			r.logger.Debugw("dependency descriptor parser restart stream", "generation", r.restartGeneration)
-		}
-		r.lastPacketAt = time.Now()
-	}
-
 	var ddVal dd.DependencyDescriptor
 	ext := &dd.DependencyDescriptorExtension{
 		Descriptor: &ddVal,