Skip to content

Commit 82ff788

Browse files
committed
Add test for latest arrival on empty reports
1 parent 1c83aea commit 82ff788

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

pkg/rtpfb/ccfb_receiver.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,21 @@ func convertCCFB(ts time.Time, feedback *rtcp.CCFeedbackReport) (time.Duration,
1717
result := map[uint32][]acknowledgement{}
1818
referenceTime := ntp.ToTime32(feedback.ReportTimestamp, ts)
1919
latestArrival := time.Time{}
20+
foundLatestArrival := false
2021
for _, rb := range feedback.ReportBlocks {
2122
var la time.Time
2223
la, result[rb.MediaSSRC] = convertMetricBlock(referenceTime, rb.BeginSequence, rb.MetricBlocks)
2324
if la.After(latestArrival) {
2425
latestArrival = la
26+
foundLatestArrival = true
2527
}
2628
}
29+
ackDelay := time.Duration(0)
30+
if foundLatestArrival {
31+
ackDelay = referenceTime.Sub(latestArrival)
32+
}
2733

28-
return referenceTime.Sub(latestArrival), result
34+
return ackDelay, result
2935
}
3036

3137
func convertMetricBlock(

pkg/rtpfb/ccfb_receiver_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ func TestConvertCCFB(t *testing.T) {
2222
expectAckDelay time.Duration
2323
}{
2424
{},
25+
{
26+
ts: timeZero.Add(2 * time.Second),
27+
feedback: &rtcp.CCFeedbackReport{},
28+
expect: map[uint32][]acknowledgement{},
29+
expectAckDelay: 0,
30+
},
2531
{
2632
ts: timeZero.Add(2 * time.Second),
2733
feedback: &rtcp.CCFeedbackReport{

0 commit comments

Comments
 (0)