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

add *Server argument to NewServerStream()

Browse Source
This commit is contained in:
aler9
2023-08-12 20:19:29 +02:00
parent ca87733ded
commit 68d4bf8da0
10 changed files with 191 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
server_test.go
View File

@@ -342,11 +342,10 @@ func (s *testServerErrMethodNotImplemented) OnSetup(
func TestServerErrorMethodNotImplemented(t *testing.T) {
for _, ca := range []string{"outside session", "inside session"} {
t.Run(ca, func(t *testing.T) {
stream := NewServerStream(media.Medias{testH264Media})
defer stream.Close()
h := &testServerErrMethodNotImplemented{}
s := &Server{
Handler: &testServerErrMethodNotImplemented{stream},
Handler: h,
RTSPAddress: "localhost:8554",
}
@@ -354,6 +353,11 @@ func TestServerErrorMethodNotImplemented(t *testing.T) {
require.NoError(t, err)
defer s.Close()
stream := NewServerStream(s, media.Medias{testH264Media})
defer stream.Close()
h.stream = stream
nconn, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err)
defer nconn.Close()
@@ -416,8 +420,7 @@ func TestServerErrorMethodNotImplemented(t *testing.T) {
}
func TestServerErrorTCPTwoConnOneSession(t *testing.T) {
stream := NewServerStream(media.Medias{testH264Media})
defer stream.Close()
var stream *ServerStream
s := &Server{
Handler: &testServerHandler{
@@ -449,6 +452,9 @@ func TestServerErrorTCPTwoConnOneSession(t *testing.T) {
require.NoError(t, err)
defer s.Close()
stream = NewServerStream(s, media.Medias{testH264Media})
defer stream.Close()
nconn1, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err)
defer nconn1.Close()
@@ -507,8 +513,7 @@ func TestServerErrorTCPTwoConnOneSession(t *testing.T) {
}
func TestServerErrorTCPOneConnTwoSessions(t *testing.T) {
stream := NewServerStream(media.Medias{testH264Media})
defer stream.Close()
var stream *ServerStream
s := &Server{
Handler: &testServerHandler{
@@ -540,6 +545,9 @@ func TestServerErrorTCPOneConnTwoSessions(t *testing.T) {
require.NoError(t, err)
defer s.Close()
stream = NewServerStream(s, media.Medias{testH264Media})
defer stream.Close()
nconn, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err)
defer nconn.Close()
@@ -590,8 +598,7 @@ func TestServerErrorTCPOneConnTwoSessions(t *testing.T) {
}
func TestServerSetupMultipleTransports(t *testing.T) {
stream := NewServerStream(media.Medias{testH264Media})
defer stream.Close()
var stream *ServerStream
s := &Server{
Handler: &testServerHandler{
@@ -613,6 +620,9 @@ func TestServerSetupMultipleTransports(t *testing.T) {
require.NoError(t, err)
defer s.Close()
stream = NewServerStream(s, media.Medias{testH264Media})
defer stream.Close()
nconn, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err)
defer nconn.Close()
@@ -674,9 +684,7 @@ func TestServerSetupMultipleTransports(t *testing.T) {
func TestServerGetSetParameter(t *testing.T) {
for _, ca := range []string{"inside session", "outside session"} {
t.Run(ca, func(t *testing.T) {
stream := NewServerStream(media.Medias{testH264Media})
defer stream.Close()
var stream *ServerStream
var params []byte
s := &Server{
@@ -723,6 +731,9 @@ func TestServerGetSetParameter(t *testing.T) {
require.NoError(t, err)
defer s.Close()
stream = NewServerStream(s, media.Medias{testH264Media})
defer stream.Close()
nconn, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err)
defer nconn.Close()
@@ -840,9 +851,7 @@ func TestServerErrorInvalidSession(t *testing.T) {
}
func TestServerSessionClose(t *testing.T) {
stream := NewServerStream(media.Medias{testH264Media})
defer stream.Close()
var stream *ServerStream
var session *ServerSession
connClosed := make(chan struct{})
@@ -872,6 +881,9 @@ func TestServerSessionClose(t *testing.T) {
require.NoError(t, err)
defer s.Close()
stream = NewServerStream(s, media.Medias{testH264Media})
defer stream.Close()
nconn, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err)
defer nconn.Close()
@@ -918,11 +930,9 @@ func TestServerSessionAutoClose(t *testing.T) {
"200", "400",
} {
t.Run(ca, func(t *testing.T) {
var stream *ServerStream
sessionClosed := make(chan struct{})
stream := NewServerStream(media.Medias{testH264Media})
defer stream.Close()
s := &Server{
Handler: &testServerHandler{
onSessionClose: func(ctx *ServerHandlerOnSessionCloseCtx) {
@@ -952,6 +962,9 @@ func TestServerSessionAutoClose(t *testing.T) {
require.NoError(t, err)
defer s.Close()
stream = NewServerStream(s, media.Medias{testH264Media})
defer stream.Close()
nconn, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err)
conn := conn.NewConn(nconn)
@@ -995,8 +1008,7 @@ func TestServerSessionAutoClose(t *testing.T) {
}
func TestServerSessionTeardown(t *testing.T) {
stream := NewServerStream(media.Medias{testH264Media})
defer stream.Close()
var stream *ServerStream
s := &Server{
Handler: &testServerHandler{
@@ -1018,6 +1030,9 @@ func TestServerSessionTeardown(t *testing.T) {
require.NoError(t, err)
defer s.Close()
stream = NewServerStream(s, media.Medias{testH264Media})
defer stream.Close()
nconn, err := net.Dial("tcp", "localhost:8554")
require.NoError(t, err)
defer nconn.Close()