support publishing with WebRTC (#1659)

bluenviron · May 11, 2023 · 1477478 · 1477478
1 parent 6ea299f
commit 1477478
Show file tree

Hide file tree

Showing 17 changed files with 1,274 additions and 632 deletions.
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ Live streams can be published to the server with:
 |RTMP servers and cameras|RTMP, RTMPS, Enhanced RTMP|H264|MPEG-4 Audio (AAC), MPEG-2 Audio (MP3)|
 |HLS servers and cameras|Low-Latency HLS, MP4-based HLS, legacy HLS|H265, H264|Opus, MPEG-4 Audio (AAC)|
 |UDP/MPEG-TS streams|Unicast, broadcast, multicast|H265, H264|Opus, MPEG-4 Audio (AAC)|
+|WebRTC||VP8|Opus|
 |Raspberry Pi Cameras||H264||
 
 And can be read from the server with:
@@ -86,6 +87,7 @@ In the next months, the repository name and the Docker image name will be change
   * [From OBS Studio](#from-obs-studio)
   * [From OpenCV](#from-opencv)
   * [From a UDP stream](#from-a-udp-stream)
+  * [From the browser](#from-the-browser)
 * [Read from the server](#read-from-the-server)
   * [From VLC and Ubuntu](#from-vlc-and-ubuntu)
 * [RTSP protocol](#rtsp-protocol)
@@ -800,6 +802,14 @@ paths:
 
 After starting the server, the stream can be reached on `rtsp://localhost:8554/udp`.
 
+### From the browser
+
+Open the page into the browser:
+
+```
+http://localhost:8889/mystream/publish
+```
+
 ## Read from the server
 
 ### From VLC and Ubuntu

diff --git a/internal/core/hls_muxer.go b/internal/core/hls_muxer.go
@@ -275,9 +275,7 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{})
 
 	m.path = res.path
 
-	defer func() {
-		m.path.readerRemove(pathReaderRemoveReq{author: m})
-	}()
+	defer m.path.readerRemove(pathReaderRemoveReq{author: m})
 
 	m.ringBuffer, _ = ringbuffer.New(uint64(m.readBufferCount))
 

diff --git a/internal/core/path.go b/internal/core/path.go
@@ -90,6 +90,7 @@ type pathGetPathConfRes struct {
 
 type pathGetPathConfReq struct {
 	name        string
+	publish     bool
 	credentials authCredentials
 	res         chan pathGetPathConfRes
 }
@@ -130,6 +131,7 @@ type pathPublisherAnnounceRes struct {
 type pathPublisherAddReq struct {
 	author      publisher
 	pathName    string
+	skipAuth    bool
 	credentials authCredentials
 	res         chan pathPublisherAnnounceRes
 }

diff --git a/internal/core/path_manager.go b/internal/core/path_manager.go
@@ -209,7 +209,8 @@ outer:
 				continue
 			}
 
-			err = authenticate(pm.externalAuthenticationURL, pm.authMethods, req.name, pathConf, false, req.credentials)
+			err = authenticate(pm.externalAuthenticationURL, pm.authMethods,
+				req.name, pathConf, req.publish, req.credentials)
 			if err != nil {
 				req.res <- pathGetPathConfRes{err: pathErrAuth{wrapped: err}}
 				continue
@@ -266,10 +267,12 @@ outer:
 				continue
 			}
 
-			err = authenticate(pm.externalAuthenticationURL, pm.authMethods, req.pathName, pathConf, true, req.credentials)
-			if err != nil {
-				req.res <- pathPublisherAnnounceRes{err: pathErrAuth{wrapped: err}}
-				continue
+			if !req.skipAuth {
+				err = authenticate(pm.externalAuthenticationURL, pm.authMethods, req.pathName, pathConf, true, req.credentials)
+				if err != nil {
+					req.res <- pathPublisherAnnounceRes{err: pathErrAuth{wrapped: err}}
+					continue
+				}
 			}
 
 			// create path if it doesn't exist

diff --git a/internal/core/rtmp_conn.go b/internal/core/rtmp_conn.go
@@ -377,11 +377,7 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error {
 		return res.err
 	}
 
-	path := res.path
-
-	defer func() {
-		path.readerRemove(pathReaderRemoveReq{author: c})
-	}()
+	defer res.path.readerRemove(pathReaderRemoveReq{author: c})
 
 	c.stateMutex.Lock()
 	c.state = rtmpConnStateRead
@@ -417,17 +413,17 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error {
 	defer res.stream.readerRemove(c)
 
 	c.Log(logger.Info, "is reading from path '%s', %s",
-		path.name, sourceMediaInfo(medias))
+		res.path.name, sourceMediaInfo(medias))
 
-	pathConf := path.safeConf()
+	pathConf := res.path.safeConf()
 
 	if pathConf.RunOnRead != "" {
 		c.Log(logger.Info, "runOnRead command started")
 		onReadCmd := externalcmd.NewCmd(
 			c.externalCmdPool,
 			pathConf.RunOnRead,
 			pathConf.RunOnReadRestart,
-			path.externalCmdEnv(),
+			res.path.externalCmdEnv(),
 			func(co int) {
 				c.Log(logger.Info, "runOnRead command exited with code %d", co)
 			})
@@ -733,11 +729,7 @@ func (c *rtmpConn) runPublish(ctx context.Context, u *url.URL) error {
 		return res.err
 	}
 
-	path := res.path
-
-	defer func() {
-		path.publisherRemove(pathPublisherRemoveReq{author: c})
-	}()
+	defer res.path.publisherRemove(pathPublisherRemoveReq{author: c})
 
 	c.stateMutex.Lock()
 	c.state = rtmpConnStatePublish
@@ -768,7 +760,7 @@ func (c *rtmpConn) runPublish(ctx context.Context, u *url.URL) error {
 		medias = append(medias, audioMedia)
 	}
 
-	rres := path.publisherStart(pathPublisherStartReq{
+	rres := res.path.publisherStart(pathPublisherStartReq{
 		author:             c,
 		medias:             medias,
 		generateRTPPackets: true,
@@ -778,7 +770,7 @@ func (c *rtmpConn) runPublish(ctx context.Context, u *url.URL) error {
 	}
 
 	c.Log(logger.Info, "is publishing to path '%s', %s",
-		path.name,
+		res.path.name,
 		sourceMediaInfo(medias))
 
 	// disable write deadline to allow outgoing acknowledges

diff --git a/internal/core/rtmp_source.go b/internal/core/rtmp_source.go
@@ -148,9 +148,7 @@ func (s *rtmpSource) run(ctx context.Context, cnf *conf.PathConf, reloadConf cha
 
 			s.Log(logger.Info, "ready: %s", sourceMediaInfo(medias))
 
-			defer func() {
-				s.parent.sourceStaticImplSetNotReady(pathSourceStaticSetNotReadyReq{})
-			}()
+			defer s.parent.sourceStaticImplSetNotReady(pathSourceStaticSetNotReadyReq{})
 
 			videoWriteFunc := getRTMPWriteFunc(videoMedia, videoFormat, res.stream)
 			audioWriteFunc := getRTMPWriteFunc(audioMedia, audioFormat, res.stream)

diff --git a/internal/core/rtsp_session.go b/internal/core/rtsp_session.go
@@ -24,7 +24,7 @@ import (
 
 type rtspWriteFunc func(*rtp.Packet)
 
-func getRTSPWriteFunc(medi *media.Media, forma formats.Format, stream *stream) rtspWriteFunc {
+func getRTPWriteFunc(medi *media.Media, forma formats.Format, stream *stream) rtspWriteFunc {
 	switch forma.(type) {
 	case *formats.H264:
 		return func(pkt *rtp.Packet) {
@@ -387,7 +387,7 @@ func (s *rtspSession) onRecord(ctx *gortsplib.ServerHandlerOnRecordCtx) (*base.R
 
 	for _, medi := range s.session.AnnouncedMedias() {
 		for _, forma := range medi.Formats {
-			writeFunc := getRTSPWriteFunc(medi, forma, s.stream)
+			writeFunc := getRTPWriteFunc(medi, forma, s.stream)
 
 			ctx.Session.OnPacketRTP(medi, forma, func(pkt *rtp.Packet) {
 				writeFunc(pkt)

diff --git a/internal/core/rtsp_source.go b/internal/core/rtsp_source.go
@@ -131,13 +131,11 @@ func (s *rtspSource) run(ctx context.Context, cnf *conf.PathConf, reloadConf cha
 
 			s.Log(logger.Info, "ready: %s", sourceMediaInfo(medias))
 
-			defer func() {
-				s.parent.sourceStaticImplSetNotReady(pathSourceStaticSetNotReadyReq{})
-			}()
+			defer s.parent.sourceStaticImplSetNotReady(pathSourceStaticSetNotReadyReq{})
 
 			for _, medi := range medias {
 				for _, forma := range medi.Formats {
-					writeFunc := getRTSPWriteFunc(medi, forma, res.stream)
+					writeFunc := getRTPWriteFunc(medi, forma, res.stream)
 
 					c.OnPacketRTP(medi, forma, func(pkt *rtp.Packet) {
 						writeFunc(pkt)

diff --git a/internal/core/udp_source.go b/internal/core/udp_source.go
@@ -304,9 +304,7 @@ func (s *udpSource) run(ctx context.Context, cnf *conf.PathConf, reloadConf chan
 				return res.err
 			}
 
-			defer func() {
-				s.parent.sourceStaticImplSetNotReady(pathSourceStaticSetNotReadyReq{})
-			}()
+			defer s.parent.sourceStaticImplSetNotReady(pathSourceStaticSetNotReadyReq{})
 
 			s.Log(logger.Info, "ready: %s", sourceMediaInfo(medias))