diff --git a/internal/staticsources/rtmp/source.go b/internal/staticsources/rtmp/source.go index 6a194c45..8ad22667 100644 --- a/internal/staticsources/rtmp/source.go +++ b/internal/staticsources/rtmp/source.go @@ -46,7 +46,11 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error { // add default port _, _, err = net.SplitHostPort(u.Host) if err != nil { - u.Host = net.JoinHostPort(u.Host, "1935") + if u.Scheme == "rtmp" { + u.Host = net.JoinHostPort(u.Host, "1935") + } else { + u.Host = net.JoinHostPort(u.Host, "1936") + } } nconn, err := func() (net.Conn, error) { diff --git a/internal/staticsources/rtmp/source_test.go b/internal/staticsources/rtmp/source_test.go index c37e6c1c..e17e7340 100644 --- a/internal/staticsources/rtmp/source_test.go +++ b/internal/staticsources/rtmp/source_test.go @@ -92,7 +92,7 @@ func TestSource(t *testing.T) { t.Run(ca, func(t *testing.T) { ln, err := func() (net.Listener, error) { if ca == "plain" { - return net.Listen("tcp", "127.0.0.1:1937") + return net.Listen("tcp", "127.0.0.1:1935") } serverCertFpath, err := writeTempFile(serverCert) @@ -107,7 +107,7 @@ func TestSource(t *testing.T) { cert, err = tls.LoadX509KeyPair(serverCertFpath, serverKeyFpath) require.NoError(t, err) - return tls.Listen("tcp", "127.0.0.1:1937", &tls.Config{Certificates: []tls.Certificate{cert}}) + return tls.Listen("tcp", "127.0.0.1:1936", &tls.Config{Certificates: []tls.Certificate{cert}}) }() require.NoError(t, err) defer ln.Close() @@ -156,7 +156,7 @@ func TestSource(t *testing.T) { te = tester.New( func(p defs.StaticSourceParent) defs.StaticSource { return &Source{ - ResolvedSource: "rtmp://localhost:1937/teststream", + ResolvedSource: "rtmp://localhost/teststream", ReadTimeout: conf.StringDuration(10 * time.Second), WriteTimeout: conf.StringDuration(10 * time.Second), Parent: p, @@ -168,7 +168,7 @@ func TestSource(t *testing.T) { te = tester.New( func(p defs.StaticSourceParent) defs.StaticSource { return &Source{ - ResolvedSource: "rtmps://localhost:1937/teststream", + ResolvedSource: "rtmps://localhost/teststream", ReadTimeout: conf.StringDuration(10 * time.Second), WriteTimeout: conf.StringDuration(10 * time.Second), Parent: p,