From 33a7df59bd10479f44cf1addd81d1e38b44bdd60 Mon Sep 17 00:00:00 2001 From: David Zhao Date: Tue, 21 Dec 2021 14:38:16 -0800 Subject: [PATCH] Moved ConnectionQuality to `PublishedTrack` interface. it wasn't needed for other MediaTrack implementations --- pkg/rtc/types/interfaces.go | 2 +- pkg/rtc/types/typesfakes/fake_media_track.go | 65 -------------------- 2 files changed, 1 insertion(+), 66 deletions(-) diff --git a/pkg/rtc/types/interfaces.go b/pkg/rtc/types/interfaces.go index d3baaeea3..0390a0e09 100644 --- a/pkg/rtc/types/interfaces.go +++ b/pkg/rtc/types/interfaces.go @@ -117,7 +117,6 @@ type MediaTrack interface { // returns quality information that's appropriate for width & height GetQualityForDimension(width, height uint32) livekit.VideoQuality - GetConnectionScore() float64 NotifySubscriberMute(subscriberID string) NotifySubscriberMaxQuality(subscriberID string, quality livekit.VideoQuality) OnSubscribedMaxQualityChange(f func(trackSid string, subscribedQualities []*livekit.SubscribedQuality) error) @@ -137,6 +136,7 @@ type PublishedTrack interface { NumUpTracks() (uint32, uint32) PublishLossPercentage() uint32 Receiver() sfu.TrackReceiver + GetConnectionScore() float64 // callbacks AddOnClose(func()) diff --git a/pkg/rtc/types/typesfakes/fake_media_track.go b/pkg/rtc/types/typesfakes/fake_media_track.go index d01efa709..4f41fba30 100644 --- a/pkg/rtc/types/typesfakes/fake_media_track.go +++ b/pkg/rtc/types/typesfakes/fake_media_track.go @@ -20,16 +20,6 @@ type FakeMediaTrack struct { addSubscriberReturnsOnCall map[int]struct { result1 error } - GetConnectionScoreStub func() float64 - getConnectionScoreMutex sync.RWMutex - getConnectionScoreArgsForCall []struct { - } - getConnectionScoreReturns struct { - result1 float64 - } - getConnectionScoreReturnsOnCall map[int]struct { - result1 float64 - } GetQualityForDimensionStub func(uint32, uint32) livekit.VideoQuality getQualityForDimensionMutex sync.RWMutex getQualityForDimensionArgsForCall []struct { @@ -213,59 +203,6 @@ func (fake *FakeMediaTrack) AddSubscriberReturnsOnCall(i int, result1 error) { }{result1} } -func (fake *FakeMediaTrack) GetConnectionScore() float64 { - fake.getConnectionScoreMutex.Lock() - ret, specificReturn := fake.getConnectionScoreReturnsOnCall[len(fake.getConnectionScoreArgsForCall)] - fake.getConnectionScoreArgsForCall = append(fake.getConnectionScoreArgsForCall, struct { - }{}) - stub := fake.GetConnectionScoreStub - fakeReturns := fake.getConnectionScoreReturns - fake.recordInvocation("GetConnectionScore", []interface{}{}) - fake.getConnectionScoreMutex.Unlock() - if stub != nil { - return stub() - } - if specificReturn { - return ret.result1 - } - return fakeReturns.result1 -} - -func (fake *FakeMediaTrack) GetConnectionScoreCallCount() int { - fake.getConnectionScoreMutex.RLock() - defer fake.getConnectionScoreMutex.RUnlock() - return len(fake.getConnectionScoreArgsForCall) -} - -func (fake *FakeMediaTrack) GetConnectionScoreCalls(stub func() float64) { - fake.getConnectionScoreMutex.Lock() - defer fake.getConnectionScoreMutex.Unlock() - fake.GetConnectionScoreStub = stub -} - -func (fake *FakeMediaTrack) GetConnectionScoreReturns(result1 float64) { - fake.getConnectionScoreMutex.Lock() - defer fake.getConnectionScoreMutex.Unlock() - fake.GetConnectionScoreStub = nil - fake.getConnectionScoreReturns = struct { - result1 float64 - }{result1} -} - -func (fake *FakeMediaTrack) GetConnectionScoreReturnsOnCall(i int, result1 float64) { - fake.getConnectionScoreMutex.Lock() - defer fake.getConnectionScoreMutex.Unlock() - fake.GetConnectionScoreStub = nil - if fake.getConnectionScoreReturnsOnCall == nil { - fake.getConnectionScoreReturnsOnCall = make(map[int]struct { - result1 float64 - }) - } - fake.getConnectionScoreReturnsOnCall[i] = struct { - result1 float64 - }{result1} -} - func (fake *FakeMediaTrack) GetQualityForDimension(arg1 uint32, arg2 uint32) livekit.VideoQuality { fake.getQualityForDimensionMutex.Lock() ret, specificReturn := fake.getQualityForDimensionReturnsOnCall[len(fake.getQualityForDimensionArgsForCall)] @@ -934,8 +871,6 @@ func (fake *FakeMediaTrack) Invocations() map[string][][]interface{} { defer fake.invocationsMutex.RUnlock() fake.addSubscriberMutex.RLock() defer fake.addSubscriberMutex.RUnlock() - fake.getConnectionScoreMutex.RLock() - defer fake.getConnectionScoreMutex.RUnlock() fake.getQualityForDimensionMutex.RLock() defer fake.getQualityForDimensionMutex.RUnlock() fake.iDMutex.RLock()