dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-08-28 23:01:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't send black screen when Track be resumed (#352)

Browse Source 
* don't send black screen when Track be resumed

* default flush
This commit is contained in:
cnderrauber
2022-01-19 18:14:38 +08:00
committed by GitHub
parent 5bea9debb7
commit 0acb0a9d66
6 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rtc/mediatracksubscriptions.go
+2 -2
View File
@@ -249,7 +249,7 @@ func (t *MediaTrackSubscriptions) AddSubscriber(sub types.LocalParticipant, code
// RemoveSubscriber removes participant from subscription
// stop all forwarders to the client
func (t *MediaTrackSubscriptions) RemoveSubscriber(participantID livekit.ParticipantID) {
func (t *MediaTrackSubscriptions) RemoveSubscriber(participantID livekit.ParticipantID, resume bool) {
subTrack := t.getSubscribedTrack(participantID)
t.subscribedTracksMu.Lock()
@@ -257,7 +257,7 @@ func (t *MediaTrackSubscriptions) RemoveSubscriber(participantID livekit.Partici
t.subscribedTracksMu.Unlock()
if subTrack != nil {
subTrack.DownTrack().Close()
subTrack.DownTrack().CloseWithFlush(!resume)
}
t.maybeNotifyNoSubscribers()
pkg/rtc/types/interfaces.go
+1 -1
View File
@@ -174,7 +174,7 @@ type MediaTrack interface {
// subscribers
AddSubscriber(participant LocalParticipant) error
RemoveSubscriber(participantID livekit.ParticipantID)
RemoveSubscriber(participantID livekit.ParticipantID, resume bool)
IsSubscriber(subID livekit.ParticipantID) bool
GetAllSubscriberIDs() []livekit.ParticipantID
RemoveAllSubscribers()
pkg/rtc/types/typesfakes/fake_local_media_track.go
+10 -8
View File
@@ -183,10 +183,11 @@ type FakeLocalMediaTrack struct {
removeAllSubscribersMutex sync.RWMutex
removeAllSubscribersArgsForCall []struct {
}
RemoveSubscriberStub func(livekit.ParticipantID)
RemoveSubscriberStub func(livekit.ParticipantID, bool)
removeSubscriberMutex sync.RWMutex
removeSubscriberArgsForCall []struct {
arg1 livekit.ParticipantID
arg2 bool
}
RevokeDisallowedSubscribersStub func([]livekit.ParticipantID) []livekit.ParticipantID
revokeDisallowedSubscribersMutex sync.RWMutex
@@ -1178,16 +1179,17 @@ func (fake *FakeLocalMediaTrack) RemoveAllSubscribersCalls(stub func()) {
fake.RemoveAllSubscribersStub = stub
}
func (fake *FakeLocalMediaTrack) RemoveSubscriber(arg1 livekit.ParticipantID) {
func (fake *FakeLocalMediaTrack) RemoveSubscriber(arg1 livekit.ParticipantID, arg2 bool) {
fake.removeSubscriberMutex.Lock()
fake.removeSubscriberArgsForCall = append(fake.removeSubscriberArgsForCall, struct {
arg1 livekit.ParticipantID
}{arg1})
arg2 bool
}{arg1, arg2})
stub := fake.RemoveSubscriberStub
fake.recordInvocation("RemoveSubscriber", []interface{}{arg1})
fake.recordInvocation("RemoveSubscriber", []interface{}{arg1, arg2})
fake.removeSubscriberMutex.Unlock()
if stub != nil {
fake.RemoveSubscriberStub(arg1)
fake.RemoveSubscriberStub(arg1, arg2)
}
}
@@ -1197,17 +1199,17 @@ func (fake *FakeLocalMediaTrack) RemoveSubscriberCallCount() int {
return len(fake.removeSubscriberArgsForCall)
}
func (fake *FakeLocalMediaTrack) RemoveSubscriberCalls(stub func(livekit.ParticipantID)) {
func (fake *FakeLocalMediaTrack) RemoveSubscriberCalls(stub func(livekit.ParticipantID, bool)) {
fake.removeSubscriberMutex.Lock()
defer fake.removeSubscriberMutex.Unlock()
fake.RemoveSubscriberStub = stub
}
func (fake *FakeLocalMediaTrack) RemoveSubscriberArgsForCall(i int) livekit.ParticipantID {
func (fake *FakeLocalMediaTrack) RemoveSubscriberArgsForCall(i int) (livekit.ParticipantID, bool) {
fake.removeSubscriberMutex.RLock()
defer fake.removeSubscriberMutex.RUnlock()
argsForCall := fake.removeSubscriberArgsForCall[i]
return argsForCall.arg1
return argsForCall.arg1, argsForCall.arg2
}
func (fake *FakeLocalMediaTrack) RevokeDisallowedSubscribers(arg1 []livekit.ParticipantID) []livekit.ParticipantID {
pkg/rtc/types/typesfakes/fake_media_track.go
+10 -8
View File
@@ -161,10 +161,11 @@ type FakeMediaTrack struct {
removeAllSubscribersMutex sync.RWMutex
removeAllSubscribersArgsForCall []struct {
}
RemoveSubscriberStub func(livekit.ParticipantID)
RemoveSubscriberStub func(livekit.ParticipantID, bool)
removeSubscriberMutex sync.RWMutex
removeSubscriberArgsForCall []struct {
arg1 livekit.ParticipantID
arg2 bool
}
RevokeDisallowedSubscribersStub func([]livekit.ParticipantID) []livekit.ParticipantID
revokeDisallowedSubscribersMutex sync.RWMutex
@@ -1027,16 +1028,17 @@ func (fake *FakeMediaTrack) RemoveAllSubscribersCalls(stub func()) {
fake.RemoveAllSubscribersStub = stub
}
func (fake *FakeMediaTrack) RemoveSubscriber(arg1 livekit.ParticipantID) {
func (fake *FakeMediaTrack) RemoveSubscriber(arg1 livekit.ParticipantID, arg2 bool) {
fake.removeSubscriberMutex.Lock()
fake.removeSubscriberArgsForCall = append(fake.removeSubscriberArgsForCall, struct {
arg1 livekit.ParticipantID
}{arg1})
arg2 bool
}{arg1, arg2})
stub := fake.RemoveSubscriberStub
fake.recordInvocation("RemoveSubscriber", []interface{}{arg1})
fake.recordInvocation("RemoveSubscriber", []interface{}{arg1, arg2})
fake.removeSubscriberMutex.Unlock()
if stub != nil {
fake.RemoveSubscriberStub(arg1)
fake.RemoveSubscriberStub(arg1, arg2)
}
}
@@ -1046,17 +1048,17 @@ func (fake *FakeMediaTrack) RemoveSubscriberCallCount() int {
return len(fake.removeSubscriberArgsForCall)
}
func (fake *FakeMediaTrack) RemoveSubscriberCalls(stub func(livekit.ParticipantID)) {
func (fake *FakeMediaTrack) RemoveSubscriberCalls(stub func(livekit.ParticipantID, bool)) {
fake.removeSubscriberMutex.Lock()
defer fake.removeSubscriberMutex.Unlock()
fake.RemoveSubscriberStub = stub
}
func (fake *FakeMediaTrack) RemoveSubscriberArgsForCall(i int) livekit.ParticipantID {
func (fake *FakeMediaTrack) RemoveSubscriberArgsForCall(i int) (livekit.ParticipantID, bool) {
fake.removeSubscriberMutex.RLock()
defer fake.removeSubscriberMutex.RUnlock()
argsForCall := fake.removeSubscriberArgsForCall[i]
return argsForCall.arg1
return argsForCall.arg1, argsForCall.arg2
}
func (fake *FakeMediaTrack) RevokeDisallowedSubscribers(arg1 []livekit.ParticipantID) []livekit.ParticipantID {
pkg/rtc/uptrackmanager.go
+1 -1
View File
@@ -130,7 +130,7 @@ func (u *UpTrackManager) AddSubscriber(sub types.LocalParticipant, params types.
func (u *UpTrackManager) RemoveSubscriber(sub types.LocalParticipant, trackID livekit.TrackID) {
track := u.GetPublishedTrack(trackID)
if track != nil {
track.RemoveSubscriber(sub.ID())
track.RemoveSubscriber(sub.ID(), false)
}
u.lock.Lock()
pkg/sfu/downtrack.go
+13 -2
View File
@@ -430,15 +430,26 @@ func (d *DownTrack) Mute(val bool) {
}
}
// Close track
func (d *DownTrack) Close() {
d.CloseWithFlush(true)
}
// Close track, flush used to indicate whether send blank frame to flush
// decoder of client.
// 1. When transceiver is reused by other participant's video track,
// set flush=true to avoid previous video shows before previous stream is displayed.
// 2. in case of session migration, participant migrate from other node, video track should
// be resumed with same participant, set flush=false since we don't need flush decoder.
func (d *DownTrack) CloseWithFlush(flush bool) {
d.forwarder.Mute(true)
// write blank frames after disabling so that other frames do not interfere.
// Idea here is to send blank 1x1 key frames to flush the decoder buffer at the remote end.
// Otherwise, with transceiver re-use last frame from previous stream is held in the
// display buffer and there could be a brief moment where the previous stream is displayed.
_ = d.writeBlankFrameRTP()
if flush {
_ = d.writeBlankFrameRTP()
}
d.closeOnce.Do(func() {
Logger.V(1).Info("Closing sender", "peer_id", d.peerID, "kind", d.kind)