packetPool: flush old packets whenever new payload starts (#21)

asticode · Apr 10, 2021 · c44c340 · c44c340
1 parent 077af8e
commit c44c340
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/packet_pool.go b/packet_pool.go
@@ -53,15 +53,12 @@ func (b *packetPool) add(p *Packet) (ps []*Packet) {
 		return
 	}
 
-	// Add packet
-	if len(mps) > 0 || (len(mps) == 0 && p.Header.PayloadUnitStartIndicator) {
-		mps = append(mps, p)
-	}
-
-	// Check payload unit start indicator
-	if p.Header.PayloadUnitStartIndicator && len(mps) > 1 {
-		ps = mps[:len(mps)-1]
+	// Flush buffer if new payload starts here
+	if p.Header.PayloadUnitStartIndicator {
+		ps = mps
 		mps = []*Packet{p}
+	} else {
+		mps = append(mps, p)
 	}
 
 	// Assign

diff --git a/packet_pool_test.go b/packet_pool_test.go
@@ -25,7 +25,7 @@ func TestPacketPool(t *testing.T) {
 	ps := b.add(&Packet{Header: &PacketHeader{ContinuityCounter: 0, HasPayload: true, PID: 1}})
 	assert.Len(t, ps, 0)
 	ps = b.add(&Packet{Header: &PacketHeader{ContinuityCounter: 1, HasPayload: true, PayloadUnitStartIndicator: true, PID: 1}})
-	assert.Len(t, ps, 0)
+	assert.Len(t, ps, 1)
 	ps = b.add(&Packet{Header: &PacketHeader{ContinuityCounter: 1, HasPayload: true, PayloadUnitStartIndicator: true, PID: 2}})
 	assert.Len(t, ps, 0)
 	ps = b.add(&Packet{Header: &PacketHeader{ContinuityCounter: 2, HasPayload: true, PID: 1}})
@@ -35,7 +35,7 @@ func TestPacketPool(t *testing.T) {
 	ps = b.add(&Packet{Header: &PacketHeader{ContinuityCounter: 5, HasPayload: true, PID: 1}})
 	assert.Len(t, ps, 0)
 	ps = b.add(&Packet{Header: &PacketHeader{ContinuityCounter: 6, HasPayload: true, PayloadUnitStartIndicator: true, PID: 1}})
-	assert.Len(t, ps, 0)
+	assert.Len(t, ps, 1)
 	ps = b.add(&Packet{Header: &PacketHeader{ContinuityCounter: 7, HasPayload: true, PID: 1}})
 	assert.Len(t, ps, 0)
 	ps = b.dump()