move units into dedicated package (bluenviron#2245)

needed by bluenviron#2244
KohaJeseMen · Aug 25, 2023 · e0fb110 · e0fb110
1 parent 23ddaac
commit e0fb110
Show file tree

Hide file tree

Showing 40 changed files with 390 additions and 318 deletions.
diff --git a/LICENSE b/LICENSE
@@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-src/internal/hls.min.js is Copyright (c) Dailymotion and is protected by
+internal/core/hls.min.js is Copyright (c) Dailymotion and is protected by
 its own license (Apache License, Version 2.0) available at
 
 https://github.com/video-dev/hls.js/blob/master/LICENSE
diff --git a/README.md b/README.md
@@ -565,7 +565,7 @@ srt://localhost:8890?streamid=publish:mystream:user:pass&pkt_size=1316
 
 If you want to publish a stream by using a client in listening mode (i.e. with `mode=listener` appended to the URL), read the next section.
 
-Known clients that can publish with SRT are [FFmpeg](#ffmpeg), [Gstreamer](#gstreamer), [OBS Studio](#obs-studio).
+Known clients that can publish with SRT are [FFmpeg](#ffmpeg), [GStreamer](#gstreamer), [OBS Studio](#obs-studio).
 
 #### SRT servers
 
@@ -596,7 +596,7 @@ http://localhost:8889/mystream/whip
 
 Depending on the network it may be difficult to establish a connection between server and clients, see [WebRTC-specific features](#webrtc-specific-features) for remediations.
 
-Known clients that can publish with WebRTC and WHIP are [FFmpeg](#ffmpeg), [Gstreamer](#gstreamer), [OBS Studio](#obs-studio).
+Known clients that can publish with WebRTC and WHIP are [FFmpeg](#ffmpeg), [GStreamer](#gstreamer), [OBS Studio](#obs-studio).
 
 #### WebRTC servers
 
@@ -619,7 +619,7 @@ rtsp://localhost:8554/mystream
 
 The resulting stream will be available in path `/mystream`.
 
-Known clients that can publish with RTSP are [FFmpeg](#ffmpeg), [Gstreamer](#gstreamer), [OBS Studio](#obs-studio).
+Known clients that can publish with RTSP are [FFmpeg](#ffmpeg), [GStreamer](#gstreamer), [OBS Studio](#obs-studio).
 
 #### RTSP cameras and servers
 
@@ -661,7 +661,7 @@ In case authentication is enabled, credentials can be passed to the server by us
 rtmp://localhost/mystream?user=myuser&pass=mypass
 ```
 
-Known clients that can publish with RTMP are [FFmpeg](#ffmpeg), [Gstreamer](#gstreamer), [OBS Studio](#obs-studio).
+Known clients that can publish with RTMP are [FFmpeg](#ffmpeg), [GStreamer](#gstreamer), [OBS Studio](#obs-studio).
 
 #### RTMP cameras and servers
 
@@ -717,7 +717,7 @@ paths:
 
 The resulting stream will be available in path `/mypath`.
 
-Known clients that can publish with WebRTC and WHIP are [FFmpeg](#ffmpeg) and [Gstreamer](#gstreamer).
+Known clients that can publish with WebRTC and WHIP are [FFmpeg](#ffmpeg) and [GStreamer](#gstreamer).
 
 ## Read from the server
 
@@ -842,7 +842,7 @@ If credentials are enabled, append username and password to `streamid`;
 srt://localhost:8890?streamid=publish:mystream:user:pass
 ```
 
-Known clients that can read with SRT are [FFmpeg](#ffmpeg-1), [Gstreamer](#gstreamer-1) and [VLC](#vlc).
+Known clients that can read with SRT are [FFmpeg](#ffmpeg-1), [GStreamer](#gstreamer-1) and [VLC](#vlc).
 
 #### WebRTC
 
@@ -860,7 +860,7 @@ http://localhost:8889/mystream/whep
 
 Depending on the network it may be difficult to establish a connection between server and clients, see [WebRTC-specific features](#webrtc-specific-features) for remediations.
 
-Known clients that can read with WebRTC and WHEP are [FFmpeg](#ffmpeg-1), [Gstreamer](#gstreamer-1) and [web browsers](#web-browsers-1).
+Known clients that can read with WebRTC and WHEP are [FFmpeg](#ffmpeg-1), [GStreamer](#gstreamer-1) and [web browsers](#web-browsers-1).
 
 #### RTSP
 
@@ -870,7 +870,7 @@ RTSP is a protocol that allows to publish and read streams. It supports differen
 rtsp://localhost:8554/mystream
 ```
 
-Known clients that can read with RTSP are [FFmpeg](#ffmpeg-1), [Gstreamer](#gstreamer-1) and [VLC](#vlc).
+Known clients that can read with RTSP are [FFmpeg](#ffmpeg-1), [GStreamer](#gstreamer-1) and [VLC](#vlc).
 
 ##### Latency
 
@@ -894,7 +894,7 @@ In case authentication is enabled, credentials can be passed to the server by us
 rtmp://localhost/mystream?user=myuser&pass=mypass
 ```
 
-Known clients that can read with RTMP are [FFmpeg](#ffmpeg-1), [Gstreamer](#gstreamer-1) and [VLC](#vlc).
+Known clients that can read with RTMP are [FFmpeg](#ffmpeg-1), [GStreamer](#gstreamer-1) and [VLC](#vlc).
 
 #### HLS
 
@@ -923,7 +923,7 @@ ffmpeg -i rtsp://original-source \
 -f rtsp rtsp://localhost:8554/mystream
 ```
 
-Known clients that can read with HLS are [FFmpeg](#ffmpeg-1), [Gstreamer](#gstreamer-1), [VLC](#vlc) and [web browsers](#web-browsers-1).
+Known clients that can read with HLS are [FFmpeg](#ffmpeg-1), [GStreamer](#gstreamer-1), [VLC](#vlc) and [web browsers](#web-browsers-1).
 
 ##### LL-HLS
 

diff --git a/internal/core/hls_muxer.go b/internal/core/hls_muxer.go
@@ -19,9 +19,9 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/formatprocessor"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/stream"
+	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
 const (
@@ -343,9 +343,9 @@ func (m *hlsMuxer) createVideoTrack(stream *stream.Stream) (*media.Media, *gohls
 		startPTSFilled := false
 		var startPTS time.Duration
 
-		stream.AddReader(m, videoMedia, videoFormatAV1, func(unit formatprocessor.Unit) {
+		stream.AddReader(m, videoMedia, videoFormatAV1, func(u unit.Unit) {
 			m.ringBuffer.Push(func() error {
-				tunit := unit.(*formatprocessor.UnitAV1)
+				tunit := u.(*unit.AV1)
 
 				if tunit.TU == nil {
 					return nil
@@ -378,9 +378,9 @@ func (m *hlsMuxer) createVideoTrack(stream *stream.Stream) (*media.Media, *gohls
 		startPTSFilled := false
 		var startPTS time.Duration
 
-		stream.AddReader(m, videoMedia, videoFormatVP9, func(unit formatprocessor.Unit) {
+		stream.AddReader(m, videoMedia, videoFormatVP9, func(u unit.Unit) {
 			m.ringBuffer.Push(func() error {
-				tunit := unit.(*formatprocessor.UnitVP9)
+				tunit := u.(*unit.VP9)
 
 				if tunit.Frame == nil {
 					return nil
@@ -413,9 +413,9 @@ func (m *hlsMuxer) createVideoTrack(stream *stream.Stream) (*media.Media, *gohls
 		startPTSFilled := false
 		var startPTS time.Duration
 
-		stream.AddReader(m, videoMedia, videoFormatH265, func(unit formatprocessor.Unit) {
+		stream.AddReader(m, videoMedia, videoFormatH265, func(u unit.Unit) {
 			m.ringBuffer.Push(func() error {
-				tunit := unit.(*formatprocessor.UnitH265)
+				tunit := u.(*unit.H265)
 
 				if tunit.AU == nil {
 					return nil
@@ -454,9 +454,9 @@ func (m *hlsMuxer) createVideoTrack(stream *stream.Stream) (*media.Media, *gohls
 		startPTSFilled := false
 		var startPTS time.Duration
 
-		stream.AddReader(m, videoMedia, videoFormatH264, func(unit formatprocessor.Unit) {
+		stream.AddReader(m, videoMedia, videoFormatH264, func(u unit.Unit) {
 			m.ringBuffer.Push(func() error {
-				tunit := unit.(*formatprocessor.UnitH264)
+				tunit := u.(*unit.H264)
 
 				if tunit.AU == nil {
 					return nil
@@ -498,9 +498,9 @@ func (m *hlsMuxer) createAudioTrack(stream *stream.Stream) (*media.Media, *gohls
 		audioStartPTSFilled := false
 		var audioStartPTS time.Duration
 
-		stream.AddReader(m, audioMedia, audioFormatOpus, func(unit formatprocessor.Unit) {
+		stream.AddReader(m, audioMedia, audioFormatOpus, func(u unit.Unit) {
 			m.ringBuffer.Push(func() error {
-				tunit := unit.(*formatprocessor.UnitOpus)
+				tunit := u.(*unit.Opus)
 
 				if !audioStartPTSFilled {
 					audioStartPTSFilled = true
@@ -539,9 +539,9 @@ func (m *hlsMuxer) createAudioTrack(stream *stream.Stream) (*media.Media, *gohls
 		audioStartPTSFilled := false
 		var audioStartPTS time.Duration
 
-		stream.AddReader(m, audioMedia, audioFormatMPEG4AudioGeneric, func(unit formatprocessor.Unit) {
+		stream.AddReader(m, audioMedia, audioFormatMPEG4AudioGeneric, func(u unit.Unit) {
 			m.ringBuffer.Push(func() error {
-				tunit := unit.(*formatprocessor.UnitMPEG4AudioGeneric)
+				tunit := u.(*unit.MPEG4AudioGeneric)
 
 				if tunit.AUs == nil {
 					return nil
@@ -582,9 +582,9 @@ func (m *hlsMuxer) createAudioTrack(stream *stream.Stream) (*media.Media, *gohls
 		audioStartPTSFilled := false
 		var audioStartPTS time.Duration
 
-		stream.AddReader(m, audioMedia, audioFormatMPEG4AudioLATM, func(unit formatprocessor.Unit) {
+		stream.AddReader(m, audioMedia, audioFormatMPEG4AudioLATM, func(u unit.Unit) {
 			m.ringBuffer.Push(func() error {
-				tunit := unit.(*formatprocessor.UnitMPEG4AudioLATM)
+				tunit := u.(*unit.MPEG4AudioLATM)
 
 				if tunit.AU == nil {
 					return nil

diff --git a/internal/core/hls_source.go b/internal/core/hls_source.go
@@ -11,9 +11,9 @@ import (
 	"github.com/bluenviron/gortsplib/v3/pkg/media"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/formatprocessor"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/stream"
+	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
 type hlsSourceParent interface {
@@ -82,8 +82,8 @@ func (s *hlsSource) run(ctx context.Context, cnf *conf.PathConf, reloadConf chan
 					}
 
 					c.OnDataAV1(track, func(pts time.Duration, tu [][]byte) {
-						stream.WriteUnit(medi, medi.Formats[0], &formatprocessor.UnitAV1{
-							BaseUnit: formatprocessor.BaseUnit{
+						stream.WriteUnit(medi, medi.Formats[0], &unit.AV1{
+							Base: unit.Base{
 								NTP: time.Now(),
 							},
 							PTS: pts,
@@ -98,8 +98,8 @@ func (s *hlsSource) run(ctx context.Context, cnf *conf.PathConf, reloadConf chan
 					}
 
 					c.OnDataVP9(track, func(pts time.Duration, frame []byte) {
-						stream.WriteUnit(medi, medi.Formats[0], &formatprocessor.UnitVP9{
-							BaseUnit: formatprocessor.BaseUnit{
+						stream.WriteUnit(medi, medi.Formats[0], &unit.VP9{
+							Base: unit.Base{
 								NTP: time.Now(),
 							},
 							PTS:   pts,
@@ -119,8 +119,8 @@ func (s *hlsSource) run(ctx context.Context, cnf *conf.PathConf, reloadConf chan
 					}
 
 					c.OnDataH26x(track, func(pts time.Duration, dts time.Duration, au [][]byte) {
-						stream.WriteUnit(medi, medi.Formats[0], &formatprocessor.UnitH264{
-							BaseUnit: formatprocessor.BaseUnit{
+						stream.WriteUnit(medi, medi.Formats[0], &unit.H264{
+							Base: unit.Base{
 								NTP: time.Now(),
 							},
 							PTS: pts,
@@ -140,8 +140,8 @@ func (s *hlsSource) run(ctx context.Context, cnf *conf.PathConf, reloadConf chan
 					}
 
 					c.OnDataH26x(track, func(pts time.Duration, dts time.Duration, au [][]byte) {
-						stream.WriteUnit(medi, medi.Formats[0], &formatprocessor.UnitH265{
-							BaseUnit: formatprocessor.BaseUnit{
+						stream.WriteUnit(medi, medi.Formats[0], &unit.H265{
+							Base: unit.Base{
 								NTP: time.Now(),
 							},
 							PTS: pts,
@@ -162,8 +162,8 @@ func (s *hlsSource) run(ctx context.Context, cnf *conf.PathConf, reloadConf chan
 					}
 
 					c.OnDataMPEG4Audio(track, func(pts time.Duration, aus [][]byte) {
-						stream.WriteUnit(medi, medi.Formats[0], &formatprocessor.UnitMPEG4AudioGeneric{
-							BaseUnit: formatprocessor.BaseUnit{
+						stream.WriteUnit(medi, medi.Formats[0], &unit.MPEG4AudioGeneric{
+							Base: unit.Base{
 								NTP: time.Now(),
 							},
 							PTS: pts,
@@ -181,8 +181,8 @@ func (s *hlsSource) run(ctx context.Context, cnf *conf.PathConf, reloadConf chan
 					}
 
 					c.OnDataOpus(track, func(pts time.Duration, packets [][]byte) {
-						stream.WriteUnit(medi, medi.Formats[0], &formatprocessor.UnitOpus{
-							BaseUnit: formatprocessor.BaseUnit{
+						stream.WriteUnit(medi, medi.Formats[0], &unit.Opus{
+							Base: unit.Base{
 								NTP: time.Now(),
 							},
 							PTS:     pts,

diff --git a/internal/core/rpicamera_source.go b/internal/core/rpicamera_source.go
@@ -8,10 +8,10 @@ import (
 	"github.com/bluenviron/gortsplib/v3/pkg/media"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/formatprocessor"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/rpicamera"
 	"github.com/bluenviron/mediamtx/internal/stream"
+	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
 func paramsFromConf(cnf *conf.PathConf) rpicamera.Params {
@@ -98,8 +98,8 @@ func (s *rpiCameraSource) run(ctx context.Context, cnf *conf.PathConf, reloadCon
 			stream = res.stream
 		}
 
-		stream.WriteUnit(medi, medi.Formats[0], &formatprocessor.UnitH264{
-			BaseUnit: formatprocessor.BaseUnit{
+		stream.WriteUnit(medi, medi.Formats[0], &unit.H264{
+			Base: unit.Base{
 				NTP: time.Now(),
 			},
 			PTS: dts,