From 48588d7c3d141251aa24eec2adc4c5e7fa0350ed Mon Sep 17 00:00:00 2001
From: cnderrauber <zengjie9004@gmail.com>
Date: Wed, 21 Sep 2022 16:59:18 +0800
Subject: [PATCH] code clean & fix h264 test fail (#1028)

---
 pkg/sfu/buffer/buffer.go   | 15 +++++----------
 pkg/sfu/buffer/nack.go     |  1 +
 test/client/trackwriter.go |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkg/sfu/buffer/buffer.go b/pkg/sfu/buffer/buffer.go
index b5cf9684f..6092f24a8 100644
--- a/pkg/sfu/buffer/buffer.go
+++ b/pkg/sfu/buffer/buffer.go
@@ -197,7 +197,6 @@ func (b *Buffer) Bind(params webrtc.RTPParameters, codec webrtc.RTPCodecCapabili
 		case webrtc.TypeRTCPFBNACK:
 			b.logger.Debugw("Setting feedback", "type", webrtc.TypeRTCPFBNACK)
 			b.nacker = NewNACKQueue()
-			b.nacker.SetRTT(70) // default till it is updated
 		}
 	}
 
@@ -521,15 +520,11 @@ func (b *Buffer) doReports(arrivalTime int64) {
 
 func (b *Buffer) buildNACKPacket() ([]rtcp.Packet, int) {
 	if nacks, numSeqNumsNacked := b.nacker.Pairs(); len(nacks) > 0 {
-		var pkts []rtcp.Packet
-		if len(nacks) > 0 {
-			pkts = []rtcp.Packet{&rtcp.TransportLayerNack{
-				SenderSSRC: b.mediaSSRC,
-				MediaSSRC:  b.mediaSSRC,
-				Nacks:      nacks,
-			}}
-		}
-
+		pkts := []rtcp.Packet{&rtcp.TransportLayerNack{
+			SenderSSRC: b.mediaSSRC,
+			MediaSSRC:  b.mediaSSRC,
+			Nacks:      nacks,
+		}}
 		return pkts, numSeqNumsNacked
 	}
 	return nil, 0
diff --git a/pkg/sfu/buffer/nack.go b/pkg/sfu/buffer/nack.go
index 81bb80407..b67c4c480 100644
--- a/pkg/sfu/buffer/nack.go
+++ b/pkg/sfu/buffer/nack.go
@@ -24,6 +24,7 @@ type NackQueue struct {
 func NewNACKQueue() *NackQueue {
 	return &NackQueue{
 		nacks: make([]*nack, 0, cacheSize),
+		rtt:   70,
 	}
 }
 
diff --git a/test/client/trackwriter.go b/test/client/trackwriter.go
index 8e9841d66..e475a2ed9 100644
--- a/test/client/trackwriter.go
+++ b/test/client/trackwriter.go
@@ -86,7 +86,7 @@ func (w *TrackWriter) Stop() {
 func (w *TrackWriter) writeNull() {
 	defer w.onWriteComplete()
 	sample := media.Sample{Data: []byte{0x0, 0xff, 0xff, 0xff, 0xff}, Duration: 30 * time.Millisecond}
-	h264Sample := media.Sample{Data: []byte{0x5, 0xff, 0xff, 0xff, 0xff}, Duration: 30 * time.Millisecond}
+	h264Sample := media.Sample{Data: []byte{0x00, 0x00, 0x00, 0x01, 0x7, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x8, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x01, 0x5, 0xff, 0xff, 0xff, 0xff}, Duration: 30 * time.Millisecond}
 	for {
 		select {
 		case <-time.After(20 * time.Millisecond):