move protocol-related code into internal/protocols (#2572)

internal/core/api.go

@@ -15,8 +15,8 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/httpserv"
 	"github.com/bluenviron/mediamtx/internal/logger"
+	"github.com/bluenviron/mediamtx/internal/protocols/httpserv"
 )
 
 var errAPINotFound = errors.New("not found")

internal/core/api_test.go

@@ -25,8 +25,8 @@ import (
 	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp"
-	"github.com/bluenviron/mediamtx/internal/webrtc"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp"
+	"github.com/bluenviron/mediamtx/internal/protocols/webrtc"
 )
 
 var testFormatH264 = &format.H264{

internal/core/hls_http_server.go

@@ -12,8 +12,8 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/httpserv"
 	"github.com/bluenviron/mediamtx/internal/logger"
+	"github.com/bluenviron/mediamtx/internal/protocols/httpserv"
 )
 
 const (

internal/core/metrics.go

@@ -10,8 +10,8 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/httpserv"
 	"github.com/bluenviron/mediamtx/internal/logger"
+	"github.com/bluenviron/mediamtx/internal/protocols/httpserv"
 )
 
 func metric(key string, tags string, value int64) string {

internal/core/metrics_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp"
 )
 
 func TestMetrics(t *testing.T) {

internal/core/path_test.go

@@ -24,8 +24,8 @@ import (
 	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp"
-	"github.com/bluenviron/mediamtx/internal/webrtc"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp"
+	"github.com/bluenviron/mediamtx/internal/protocols/webrtc"
 )
 
 var runOnDemandSampleScript = `

internal/core/pprof.go

@@ -8,8 +8,8 @@ import (
 	_ "net/http/pprof"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/httpserv"
 	"github.com/bluenviron/mediamtx/internal/logger"
+	"github.com/bluenviron/mediamtx/internal/protocols/httpserv"
 )
 
 type pprofParent interface {

internal/core/rtmp_conn.go

@@ -21,7 +21,7 @@ import (
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/externalcmd"
 	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/rtmp"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp"
 	"github.com/bluenviron/mediamtx/internal/stream"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )

internal/core/rtmp_server_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp"
 )
 
 func TestRTMPServer(t *testing.T) {

internal/core/rtmp_source.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/rtmp"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp"
 	"github.com/bluenviron/mediamtx/internal/stream"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )

internal/core/rtmp_source_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp"
 )
 
 func TestRTMPSource(t *testing.T) {

internal/core/webrtc_http_server.go

@@ -16,9 +16,9 @@ import (
 	pwebrtc "github.com/pion/webrtc/v3"
 
 	"github.com/bluenviron/mediamtx/internal/conf"
-	"github.com/bluenviron/mediamtx/internal/httpserv"
 	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/webrtc"
+	"github.com/bluenviron/mediamtx/internal/protocols/httpserv"
+	"github.com/bluenviron/mediamtx/internal/protocols/webrtc"
 )
 
 //go:embed webrtc_publish_index.html

internal/core/webrtc_manager.go

@@ -21,7 +21,7 @@ import (
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/externalcmd"
 	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/webrtc"
+	"github.com/bluenviron/mediamtx/internal/protocols/webrtc"
 )
 
 const (

internal/core/webrtc_manager_test.go

@@ -16,7 +16,7 @@ import (
 	pwebrtc "github.com/pion/webrtc/v3"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/webrtc"
+	"github.com/bluenviron/mediamtx/internal/protocols/webrtc"
 )
 
 func TestWebRTCRead(t *testing.T) {

internal/core/webrtc_session.go

@@ -25,9 +25,9 @@ import (
 	"github.com/bluenviron/mediamtx/internal/asyncwriter"
 	"github.com/bluenviron/mediamtx/internal/externalcmd"
 	"github.com/bluenviron/mediamtx/internal/logger"
+	"github.com/bluenviron/mediamtx/internal/protocols/webrtc"
 	"github.com/bluenviron/mediamtx/internal/stream"
 	"github.com/bluenviron/mediamtx/internal/unit"
-	"github.com/bluenviron/mediamtx/internal/webrtc"
 )
 
 type webrtcTrackWrapper struct {

internal/core/webrtc_source.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/bluenviron/mediamtx/internal/conf"
 	"github.com/bluenviron/mediamtx/internal/logger"
-	"github.com/bluenviron/mediamtx/internal/webrtc"
+	"github.com/bluenviron/mediamtx/internal/protocols/webrtc"
 )
 
 type webRTCSourceParent interface {

internal/core/webrtc_source_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/webrtc"
+	"github.com/bluenviron/mediamtx/internal/protocols/webrtc"
 )
 
 func TestWebRTCSource(t *testing.T) {

internal/protocols/rtmp/conn.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/notedit/rtmp/format/flv/flvio"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
-	"github.com/bluenviron/mediamtx/internal/rtmp/handshake"
-	"github.com/bluenviron/mediamtx/internal/rtmp/message"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/handshake"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/message"
 )
 
 func resultIsOK1(res *message.CommandAMF0) bool {

internal/protocols/rtmp/conn_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/notedit/rtmp/format/flv/flvio"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
-	"github.com/bluenviron/mediamtx/internal/rtmp/handshake"
-	"github.com/bluenviron/mediamtx/internal/rtmp/message"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/handshake"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/message"
 )
 
 func TestNewClientConn(t *testing.T) {

internal/protocols/rtmp/message/acknowledge.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // Acknowledge is an acknowledgement message.

internal/protocols/rtmp/message/audio.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 const (

internal/protocols/rtmp/message/command_amf0.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/notedit/rtmp/format/flv/flvio"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // CommandAMF0 is a AMF0 command message.

internal/protocols/rtmp/message/data_amf0.go

@@ -3,7 +3,7 @@ package message
 import (
 	"github.com/notedit/rtmp/format/flv/flvio"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // DataAMF0 is a AMF0 data message.

internal/protocols/rtmp/message/extended_coded_frames.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // ExtendedCodedFrames is a CodedFrames extended message.

internal/protocols/rtmp/message/extended_frames_x.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // ExtendedFramesX is a FramesX extended message.

internal/protocols/rtmp/message/extended_metadata.go

@@ -3,7 +3,7 @@ package message
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // ExtendedMetadata is a metadata extended message.

internal/protocols/rtmp/message/extended_mpeg2ts_sequence_start.go

@@ -3,7 +3,7 @@ package message
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // ExtendedMPEG2TSSequenceStart is a MPEG2-TS sequence start extended message.

internal/protocols/rtmp/message/extended_sequence_end.go

@@ -3,7 +3,7 @@ package message
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // ExtendedSequenceEnd is a sequence end extended message.

internal/protocols/rtmp/message/extended_sequence_start.go

@@ -3,7 +3,7 @@ package message
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // ExtendedSequenceStart is a sequence start extended message.

internal/protocols/rtmp/message/message.go

@@ -2,7 +2,7 @@
 package message
 
 import (
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 const (

internal/protocols/rtmp/message/reader.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 func allocateMessage(raw *rawmessage.Message) (Message, error) {

internal/protocols/rtmp/message/reader_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/notedit/rtmp/format/flv/flvio"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
 )
 
 var readWriterCases = []struct {

internal/protocols/rtmp/message/readwriter.go

@@ -3,7 +3,7 @@ package message
 import (
 	"io"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
 )
 
 // ReadWriter is a message reader/writer.

internal/protocols/rtmp/message/readwriter_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
 )
 
 type duplexRW struct {

internal/protocols/rtmp/message/set_chunk_size.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // SetChunkSize is a set chunk size message.

internal/protocols/rtmp/message/set_peer_bandwidth.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // SetPeerBandwidth is a set peer bandwidth message.

internal/protocols/rtmp/message/set_window_ack_size.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // SetWindowAckSize is a set window acknowledgement message.

internal/protocols/rtmp/message/user_control_ping_request.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // UserControlPingRequest is a user control message.

internal/protocols/rtmp/message/user_control_ping_response.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // UserControlPingResponse is a user control message.

internal/protocols/rtmp/message/user_control_set_buffer_length.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // UserControlSetBufferLength is a user control message.

internal/protocols/rtmp/message/user_control_stream_begin.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // UserControlStreamBegin is a user control message.

internal/protocols/rtmp/message/user_control_stream_dry.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // UserControlStreamDry is a user control message.

internal/protocols/rtmp/message/user_control_stream_eof.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // UserControlStreamEOF is a user control message.

internal/protocols/rtmp/message/user_control_stream_is_recorded.go

@@ -3,7 +3,7 @@ package message //nolint:dupl
 import (
 	"fmt"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // UserControlStreamIsRecorded is a user control message.

internal/protocols/rtmp/message/video.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/notedit/rtmp/format/flv/flvio"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 const (

internal/protocols/rtmp/message/writer.go

@@ -3,8 +3,8 @@ package message
 import (
 	"io"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
-	"github.com/bluenviron/mediamtx/internal/rtmp/rawmessage"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage"
 )
 
 // Writer is a message writer.

internal/protocols/rtmp/message/writer_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
 )
 
 func TestWriter(t *testing.T) {

internal/protocols/rtmp/rawmessage/reader.go

@@ -7,8 +7,8 @@ import (
 	"io"
 	"time"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
-	"github.com/bluenviron/mediamtx/internal/rtmp/chunk"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/chunk"
 )
 
 var errMoreChunksNeeded = errors.New("more chunks are needed")

internal/protocols/rtmp/rawmessage/reader_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/rtmp/bytecounter"
-	"github.com/bluenviron/mediamtx/internal/rtmp/chunk"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
+	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/chunk"
 )
 
 var cases = []struct {