package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-02 14:02:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

server: fix SETUP in case of no track ID and query parameters (#623)

Browse Source
This commit is contained in:
Alessandro Ros
2024-09-15 23:24:34 +02:00
committed by GitHub
parent 28f91637d4
commit 6ed93de46c
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server_play_test.go
View File

@@ -198,6 +198,18 @@ func TestServerPlayPath(t *testing.T) {
"rtsp://localhost:8554/teststream/", "rtsp://localhost:8554/teststream/",
"/teststream", "/teststream",
}, },
{
"without media id, query, ffmpeg",
"rtsp://localhost:8554/teststream?testing=123/",
"rtsp://localhost:8554/teststream/",
"/teststream",
},
{
"without media id, query, gstreamer",
"rtsp://localhost:8554/teststream/?testing=123",
"rtsp://localhost:8554/teststream/",
"/teststream",
},
{ {
"subpath", "subpath",
"rtsp://localhost:8554/test/stream[control]", "rtsp://localhost:8554/test/stream[control]",

3
server_session.go
View File

@@ -73,6 +73,9 @@ func getPathAndQueryAndTrackID(u *base.URL) (string, string, string, error) {
// no track ID and a trailing slash. // no track ID and a trailing slash.
// this happens when trying to read a MPEG-TS stream with FFmpeg. // this happens when trying to read a MPEG-TS stream with FFmpeg.
if strings.HasSuffix(u.RawQuery, "/") {
return u.Path, u.RawQuery[:len(u.RawQuery)-1], "0", nil
}
if strings.HasSuffix(u.Path[1:], "/") { if strings.HasSuffix(u.Path[1:], "/") {
return u.Path[:len(u.Path)-1], u.RawQuery, "0", nil return u.Path[:len(u.Path)-1], u.RawQuery, "0", nil
} }