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

server: fill ctx.Query correctly (#73)

Browse Source
This commit is contained in:
aler9
2021-09-23 08:53:10 +02:00
parent dbfc058f0c
commit 84837b9751
7 changed files with 89 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
server_test.go
View File

@@ -286,11 +286,16 @@ func TestServerHighLevelPublishRead(t *testing.T) {
}
},
onDescribe: func(ctx *ServerHandlerOnDescribeCtx) (*base.Response, *ServerStream, error) {
if ctx.Path != "teststream" {
if ctx.Path != "test/stream" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, nil, fmt.Errorf("invalid path (%s)", ctx.Req.URL)
}
if ctx.Query != "key=val" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, nil, fmt.Errorf("invalid query (%s)", ctx.Query)
}
mutex.Lock()
defer mutex.Unlock()
@@ -306,11 +311,16 @@ func TestServerHighLevelPublishRead(t *testing.T) {
}, stream, nil
},
onAnnounce: func(ctx *ServerHandlerOnAnnounceCtx) (*base.Response, error) {
if ctx.Path != "teststream" {
if ctx.Path != "test/stream" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, fmt.Errorf("invalid path (%s)", ctx.Req.URL)
}
if ctx.Query != "key=val" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, fmt.Errorf("invalid query (%s)", ctx.Query)
}
mutex.Lock()
defer mutex.Unlock()
@@ -329,11 +339,16 @@ func TestServerHighLevelPublishRead(t *testing.T) {
}, nil
},
onSetup: func(ctx *ServerHandlerOnSetupCtx) (*base.Response, *ServerStream, error) {
if ctx.Path != "teststream" {
if ctx.Path != "test/stream" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, nil, fmt.Errorf("invalid path (%s)", ctx.Req.URL)
}
if ctx.Query != "key=val" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, nil, fmt.Errorf("invalid query (%s)", ctx.Query)
}
if stream == nil {
return &base.Response{
@@ -346,22 +361,32 @@ func TestServerHighLevelPublishRead(t *testing.T) {
}, stream, nil
},
onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) {
if ctx.Path != "teststream" {
if ctx.Path != "test/stream" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, fmt.Errorf("invalid path (%s)", ctx.Req.URL)
}
if ctx.Query != "key=val" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, fmt.Errorf("invalid query (%s)", ctx.Query)
}
return &base.Response{
StatusCode: base.StatusOK,
}, nil
},
onRecord: func(ctx *ServerHandlerOnRecordCtx) (*base.Response, error) {
if ctx.Path != "teststream" {
if ctx.Path != "test/stream" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, fmt.Errorf("invalid path (%s)", ctx.Req.URL)
}
if ctx.Query != "key=val" {
return &base.Response{
StatusCode: base.StatusBadRequest,
}, fmt.Errorf("invalid query (%s)", ctx.Query)
}
return &base.Response{
StatusCode: base.StatusOK,
@@ -415,7 +440,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
"-c", "copy",
"-f", "rtsp",
"-rtsp_transport", ts,
proto + "://localhost:8554/teststream",
proto + "://localhost:8554/test/stream?key=val",
})
require.NoError(t, err)
defer cnt1.close()
@@ -431,7 +456,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
cnt1, err := newContainer("gstreamer", "publish", []string{
"filesrc location=emptyvideo.mkv ! matroskademux ! video/x-h264 ! rtspclientsink " +
"location=" + proto + "://127.0.0.1:8554/teststream protocols=" + ts +
"location=" + proto + "://127.0.0.1:8554/test/stream?key=val protocols=" + ts +
" tls-validation-flags=0 latency=0 timeout=0 rtx-time=0",
})
require.NoError(t, err)
@@ -456,7 +481,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
cnt2, err := newContainer("ffmpeg", "read", []string{
"-rtsp_transport", ts,
"-i", proto + "://localhost:8554/teststream",
"-i", proto + "://localhost:8554/test/stream?key=val",
"-vframes", "1",
"-f", "image2",
"-y", "/dev/null",
@@ -477,7 +502,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
}()
cnt2, err := newContainer("gstreamer", "read", []string{
"rtspsrc location=" + proto + "://127.0.0.1:8554/teststream protocols=" + ts +
"rtspsrc location=" + proto + "://127.0.0.1:8554/test/stream?key=val protocols=" + ts +
" tls-validation-flags=0 latency=0 " +
"! application/x-rtp,media=video ! decodebin ! exitafterframe ! fakesink",
})