Remove adaptive temporarily & Fix listener interafce #8

channel-io · May 3, 2023 · f44eb7f · f44eb7f
2 parents e36e469 + ba7c4aa
commit f44eb7f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/pkg/jitter/jitter.go b/pkg/jitter/jitter.go
@@ -87,7 +87,7 @@ func (b *Jitter) Put(p *Packet) {
 	b.Lock()
 	defer b.Unlock()
 
-	b.listener.OnPacketEnqueue(b.targetTime(), b.sumRemainingTs(), p)
+	b.listener.OnPacketEnqueue(b.currentTime(), b.targetTime(), b.sumRemainingTs(), p)
 
 	if !b.marked || math.Abs(float64(p.Timestamp-b.currentTime())) > float64(b.maxLatency) {
 		oldCurrent := b.currentTime()
@@ -114,7 +114,7 @@ func (b *Jitter) Get() ([]*Packet, bool) {
 		return nil, false
 	}
 
-	b.adaptive()
+	//b.adaptive()
 
 	targetTime := b.targetTime()
 
@@ -129,7 +129,7 @@ func (b *Jitter) Get() ([]*Packet, bool) {
 		b.loss.Set(targetTime, nil)
 
 		b.currentOffset += b.defaultTickInterval
-		b.listener.OnPacketLoss(b.targetTime(), b.sumRemainingTs())
+		b.listener.OnPacketLoss(b.currentTime(), b.targetTime(), b.sumRemainingTs())
 
 		return nil, false
 	}
@@ -139,7 +139,7 @@ func (b *Jitter) Get() ([]*Packet, bool) {
 	incr := newTargetTime - targetTime
 
 	b.currentOffset += incr
-	b.listener.OnPacketDequeue(b.targetTime(), b.sumRemainingTs(), ret)
+	b.listener.OnPacketDequeue(b.currentTime(), b.targetTime(), b.sumRemainingTs(), ret)
 
 	return ret, true
 }
@@ -170,7 +170,6 @@ func (b *Jitter) dequeuePackets() []*Packet {
 func (b *Jitter) adaptive() {
 	newLatency := b.calculateLatency()
 	if newLatency != b.latency {
-		b.listener.OnLatencyChanged(newLatency)
 		b.late.Init()
 		b.latency = newLatency
 	}

diff --git a/pkg/jitter/listener.go b/pkg/jitter/listener.go
@@ -1,28 +1,23 @@
 package jitter
 
 type Listener interface {
-	OnPacketLoss(targetTs, remainingTs int64)
-	OnPacketEnqueue(targetTs, remainingTs int64, pkt *Packet)
-	OnPacketDequeue(targetTs, remainingTs int64, pkt []*Packet)
-	OnLatencyChanged(new int64)
+	OnPacketLoss(currentTs, targetTs, remainingTs int64)
+	OnPacketEnqueue(currentTs, targetTs, remainingTs int64, pkt *Packet)
+	OnPacketDequeue(currentTs, targetTs, remainingTs int64, pkt []*Packet)
 	OnReSyncTriggered(oldCurrent int64, newCurrent int64)
 }
 
 type NullListener struct {
 }
 
-func (n NullListener) OnPacketLoss(currentTs, remainingTs int64) {
+func (n NullListener) OnPacketLoss(currentTs, targetTs, remainingTs int64) {
 }
 
-func (n NullListener) OnLatencyChanged(new int64) {
+func (n NullListener) OnPacketEnqueue(currentTs, targetTs, remainingTs int64, pkt *Packet) {
 }
 
-func (n NullListener) OnPacketEnqueue(currentTs, remainingTs int64, pkt *Packet) {
-}
-
-func (n NullListener) OnPacketDequeue(currentTs, remainingTs int64, pkt []*Packet) {
+func (n NullListener) OnPacketDequeue(currentTs, targetTs, remainingTs int64, pkt []*Packet) {
 }
 
 func (n NullListener) OnReSyncTriggered(oldCurrent int64, newCurrent int64) {
-
 }