fix simulcast track

inlivedev · Jan 24, 2024 · 339fed9 · 339fed9
1 parent 8565980
commit 339fed9
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/clienttrack.go b/clienttrack.go
@@ -52,7 +52,7 @@ func newClientTrack(c *Client, t *Track, isScreen bool) *clientTrack {
 		localTrack:  t.createLocalTrack(),
 		remoteTrack: t.remoteTrack,
 		isScreen:    isScreen,
-		packetChan:  make(chan rtp.Packet, 1024),
+		packetChan:  make(chan rtp.Packet, 1),
 	}
 
 	ct.startWorker()
@@ -65,7 +65,6 @@ func (t *clientTrack) startWorker() {
 		for {
 			select {
 			case <-t.context.Done():
-				close(t.packetChan)
 				return
 			case p := <-t.packetChan:
 				t.processPacket(p)

diff --git a/clienttrackred.go b/clienttrackred.go
@@ -65,7 +65,6 @@ func (t *clientTrackRed) startWorker() {
 		for {
 			select {
 			case <-t.context.Done():
-				close(t.packetChan)
 				return
 			case p := <-t.packetChan:
 				t.processPacket(p)

diff --git a/clienttracksimulcast.go b/clienttracksimulcast.go
@@ -73,6 +73,7 @@ func newSimulcastClientTrack(c *Client, t *SimulcastTrack) *simulcastClientTrack
 		isScreen:                isScreen,
 		isEnded:                 &atomic.Bool{},
 		onTrackEndedCallbacks:   make([]func(), 0),
+		packetChan:              make(chan simulcastPacket, 1),
 	}
 
 	ct.startWorker()
@@ -92,7 +93,6 @@ func (t *simulcastClientTrack) startWorker() {
 		for {
 			select {
 			case <-t.context.Done():
-				close(t.packetChan)
 				return
 			case p := <-t.packetChan:
 

diff --git a/clienttracksvc.go b/clienttracksvc.go
@@ -143,7 +143,6 @@ func (t *scaleableClientTrack) startWorker() {
 		for {
 			select {
 			case <-t.context.Done():
-				close(t.packetChan)
 				return
 			case p := <-t.packetChan:
 				t.processPacket(p)

diff --git a/remotetrack.go b/remotetrack.go
@@ -66,15 +66,14 @@ func (t *remoteTrack) Context() context.Context {
 func (t *remoteTrack) readRTP() {
 	go func() {
 		defer t.cancel()
-
 		for {
 			select {
 			case <-t.context.Done():
 				return
 			default:
 				if err := t.track.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
 					glog.Error("error setting read deadline: ", err.Error())
-					return
+					continue
 				}
 
 				rtp, _, readErr := t.track.ReadRTP()
@@ -89,7 +88,6 @@ func (t *remoteTrack) readRTP() {
 						go t.updateStats()
 					}
 				}
-
 			}
 		}
 	}()