pktque.Buf: bugfix: release pkt.Data

av/pktque/buf.go

@@ -1,20 +1,20 @@
-
 package pktque
 
 import (
 	"github.com/nareix/joy4/av"
 )
 
 type Buf struct {
-	Head, Tail BufPos
-	pkts []av.Packet
+	Head, Tail    BufPos
+	pkts          []av.Packet
 	size, maxsize int
+	count         int
 }
 
 func NewBuf() *Buf {
 	return &Buf{
-		pkts: make([]av.Packet, 64),
-		maxsize: 1024*512,
+		pkts:    make([]av.Packet, 64),
+		maxsize: 1024 * 512,
 	}
 }
 
@@ -24,10 +24,13 @@ func (self *Buf) SetMaxSize(size int) {
 }
 
 func (self *Buf) shrink() {
-	for self.size > self.maxsize && self.Head-self.Tail > 1 {
-		pkt := self.pkts[int(self.Head)&(len(self.pkts)-1)]
+	for self.size > self.maxsize && self.count > 1 {
+		i := int(self.Head) & (len(self.pkts) - 1)
+		pkt := self.pkts[i]
+		self.pkts[i] = av.Packet{}
 		self.size -= len(pkt.Data)
 		self.Head++
+		self.count--
 	}
 }
 
@@ -40,11 +43,12 @@ func (self *Buf) grow() {
 }
 
 func (self *Buf) Push(pkt av.Packet) {
-	if int(self.Tail-self.Head) == len(self.pkts) {
+	if self.count == len(self.pkts) {
 		self.grow()
 	}
 	self.pkts[int(self.Tail)&(len(self.pkts)-1)] = pkt
 	self.Tail++
+	self.count++
 	self.size += len(pkt.Data)
 	self.shrink()
 }
@@ -60,14 +64,13 @@ func (self *Buf) IsValidPos(pos BufPos) bool {
 type BufPos int
 
 func (self BufPos) LT(pos BufPos) bool {
-	return self - pos < 0
+	return self-pos < 0
 }
 
 func (self BufPos) GE(pos BufPos) bool {
-	return self - pos >= 0
+	return self-pos >= 0
 }
 
 func (self BufPos) GT(pos BufPos) bool {
-	return self - pos > 0
+	return self-pos > 0
 }
-