avoid returning partial RTP-Info header, omit seq/rtptime if needed (#…

…568) * avoid returning partial RTP-Info header, omit seq/rtptime if needed * adjust test to align with new behavior of RTP-Info header
bluenviron · May 9, 2024 · 9f6428b · 9f6428b
1 parent 877771e
commit 9f6428b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/server_play_test.go b/server_play_test.go
@@ -1901,6 +1901,13 @@ func TestServerPlayAdditionalInfos(t *testing.T) {
 			SequenceNumber: uint16Ptr(557),
 			Timestamp:      (*rtpInfo)[0].Timestamp,
 		},
+		&headers.RTPInfoEntry{
+			URL: (&base.URL{
+				Scheme: "rtsp",
+				Host:   "localhost:8554",
+				Path:   mustParseURL((*rtpInfo)[1].URL).Path,
+			}).String(),
+		},
 	}, rtpInfo)
 	require.Equal(t, []*uint32{
 		uint32Ptr(96342362),

diff --git a/server_session.go b/server_session.go
@@ -128,15 +128,16 @@ func generateRTPInfo(
 
 	for _, sm := range setuppedMediasOrdered {
 		entry := setuppedStream.rtpInfoEntry(sm.media, now)
-		if entry != nil {
-			entry.URL = (&base.URL{
-				Scheme: u.Scheme,
-				Host:   u.Host,
-				Path: setuppedPath + "/trackID=" +
-					strconv.FormatInt(int64(setuppedStream.streamMedias[sm.media].trackID), 10),
-			}).String()
-			ri = append(ri, entry)
-		}
+		if entry == nil {
+			entry = &headers.RTPInfoEntry{}
+		}
+		entry.URL = (&base.URL{
+			Scheme: u.Scheme,
+			Host:   u.Host,
+			Path: setuppedPath + "/trackID=" +
+				strconv.FormatInt(int64(setuppedStream.streamMedias[sm.media].trackID), 10),
+		}).String()
+		ri = append(ri, entry)
 	}
 
 	if len(ri) == 0 {