rename formatprocessor into codecprocessor (#4962)

internal/codecprocessor/ac3.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"errors"

internal/codecprocessor/av1.go

@@ -1,4 +1,4 @@
-package formatprocessor //nolint:dupl
+package codecprocessor //nolint:dupl
 
 import (
 	"errors"

internal/codecprocessor/av1_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"testing"

internal/codecprocessor/g711.go

@@ -1,4 +1,4 @@
-package formatprocessor //nolint:dupl
+package codecprocessor //nolint:dupl
 
 import (
 	"fmt"

internal/codecprocessor/g711_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"testing"

internal/codecprocessor/generic.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"fmt"

internal/codecprocessor/generic_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"testing"

internal/codecprocessor/h264.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"bytes"

internal/codecprocessor/h264_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"bytes"

internal/codecprocessor/h265.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"bytes"

internal/codecprocessor/h265_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"bytes"

internal/codecprocessor/klv.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"fmt"

internal/codecprocessor/klv_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"testing"

internal/codecprocessor/lpcm.go

@@ -1,4 +1,4 @@
-package formatprocessor //nolint:dupl
+package codecprocessor //nolint:dupl
 
 import (
 	"fmt"

internal/codecprocessor/lpcm_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"testing"

internal/codecprocessor/mjpeg.go

@@ -1,4 +1,4 @@
-package formatprocessor //nolint:dupl
+package codecprocessor //nolint:dupl
 
 import (
 	"errors"

internal/codecprocessor/mpeg1_audio.go

@@ -1,4 +1,4 @@
-package formatprocessor //nolint:dupl
+package codecprocessor //nolint:dupl
 
 import (
 	"errors"

internal/codecprocessor/mpeg1_video.go

@@ -1,4 +1,4 @@
-package formatprocessor //nolint:dupl
+package codecprocessor //nolint:dupl
 
 import (
 	"errors"

internal/codecprocessor/mpeg4_audio.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"errors"

internal/codecprocessor/mpeg4_audio_latm.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"errors"

internal/codecprocessor/mpeg4_video.go

@@ -1,4 +1,4 @@
-package formatprocessor //nolint:dupl
+package codecprocessor //nolint:dupl
 
 import (
 	"bytes"

internal/codecprocessor/mpeg4_video_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"testing"

internal/codecprocessor/opus.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"fmt"

internal/codecprocessor/opus_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"testing"

internal/codecprocessor/processor.go

@@ -1,5 +1,5 @@
-// Package formatprocessor cleans and normalizes streams.
-package formatprocessor
+// Package codecprocessor contains codec-specific processing.
+package codecprocessor
 
 import (
 	"crypto/rand"
@@ -21,7 +21,7 @@ func randUint32() (uint32, error) {
 	return uint32(b[0])<<24 | uint32(b[1])<<16 | uint32(b[2])<<8 | uint32(b[3]), nil
 }
 
-// Processor is the codec-dependent part of the processing that happens inside stream.Stream.
+// Processor is the codec-specific part of the processing that happens inside stream.Stream.
 type Processor interface {
 	// process a Unit.
 	ProcessUnit(unit.Unit) error

internal/codecprocessor/processor_test.go

@@ -1,4 +1,4 @@
-package formatprocessor
+package codecprocessor
 
 import (
 	"testing"

internal/codecprocessor/vp8.go

@@ -1,4 +1,4 @@
-package formatprocessor //nolint:dupl
+package codecprocessor //nolint:dupl
 
 import (
 	"errors"

internal/codecprocessor/vp9.go

@@ -1,4 +1,4 @@
-package formatprocessor //nolint:dupl
+package codecprocessor //nolint:dupl
 
 import (
 	"errors"

internal/protocols/rtmp/from_stream_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/bluenviron/gortsplib/v4/pkg/description"
 	"github.com/bluenviron/gortsplib/v4/pkg/format"
-	"github.com/bluenviron/mediamtx/internal/formatprocessor"
+	"github.com/bluenviron/mediamtx/internal/codecprocessor"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/stream"
 	"github.com/bluenviron/mediamtx/internal/test"
@@ -329,15 +329,15 @@ func TestFromStream(t *testing.T) {
 					require.Equal(t, []format.Format{
 						&format.H265{
 							PayloadTyp: 96,
-							VPS:        formatprocessor.H265DefaultVPS,
-							SPS:        formatprocessor.H265DefaultSPS,
-							PPS:        formatprocessor.H265DefaultPPS,
+							VPS:        codecprocessor.H265DefaultVPS,
+							SPS:        codecprocessor.H265DefaultSPS,
+							PPS:        codecprocessor.H265DefaultPPS,
 						},
 						&format.H264{
 							PayloadTyp:        96,
 							PacketizationMode: 1,
-							SPS:               formatprocessor.H264DefaultSPS,
-							PPS:               formatprocessor.H264DefaultPPS,
+							SPS:               codecprocessor.H264DefaultSPS,
+							PPS:               codecprocessor.H264DefaultPPS,
 						},
 						&format.VP9{
 							PayloadTyp: 96,
@@ -576,17 +576,17 @@ func TestFromStream(t *testing.T) {
 			case "h265 + h264 + vp9 + av1 + opus + aac":
 				strm.WriteUnit(medias[0], medias[0].Formats[0], &unit.H265{
 					AU: [][]byte{
-						formatprocessor.H265DefaultVPS,
-						formatprocessor.H265DefaultSPS,
-						formatprocessor.H265DefaultPPS,
+						codecprocessor.H265DefaultVPS,
+						codecprocessor.H265DefaultSPS,
+						codecprocessor.H265DefaultPPS,
 						{0x26, 0x1, 0xaf, 0x8, 0x42, 0x23, 0x48, 0x8a, 0x43, 0xe2},
 					},
 				})
 
 				strm.WriteUnit(medias[1], medias[1].Formats[0], &unit.H264{
 					AU: [][]byte{
-						formatprocessor.H264DefaultSPS,
-						formatprocessor.H264DefaultPPS,
+						codecprocessor.H264DefaultSPS,
+						codecprocessor.H264DefaultPPS,
 						{5, 2}, // IDR
 					},
 				})

internal/protocols/rtmp/writer.go

@@ -12,7 +12,7 @@ import (
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/h265"
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg1audio"
 
-	"github.com/bluenviron/mediamtx/internal/formatprocessor"
+	"github.com/bluenviron/mediamtx/internal/codecprocessor"
 	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/amf0"
 	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/h264conf"
 	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/message"
@@ -383,9 +383,9 @@ func (w *Writer) writeTracks() error {
 		case *format.H265:
 			vps, sps, pps := track.SafeParams()
 			if vps == nil || sps == nil || pps == nil {
-				vps = formatprocessor.H265DefaultVPS
-				sps = formatprocessor.H265DefaultSPS
-				pps = formatprocessor.H265DefaultPPS
+				vps = codecprocessor.H265DefaultVPS
+				sps = codecprocessor.H265DefaultSPS
+				pps = codecprocessor.H265DefaultPPS
 			}
 
 			var msg message.Message = &message.VideoExSequenceStart{
@@ -411,8 +411,8 @@ func (w *Writer) writeTracks() error {
 		case *format.H264:
 			sps, pps := track.SafeParams()
 			if sps == nil || pps == nil {
-				sps = formatprocessor.H264DefaultSPS
-				pps = formatprocessor.H264DefaultPPS
+				sps = codecprocessor.H264DefaultSPS
+				pps = codecprocessor.H264DefaultPPS
 			}
 
 			if id == 0 {

internal/protocols/rtmp/writer_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bluenviron/mediamtx/internal/formatprocessor"
+	"github.com/bluenviron/mediamtx/internal/codecprocessor"
 	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/amf0"
 	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter"
 	"github.com/bluenviron/mediamtx/internal/protocols/rtmp/message"
@@ -516,8 +516,8 @@ func TestWriter(t *testing.T) {
 					ChunkStreamID:   message.VideoChunkStreamID,
 					MessageStreamID: 0x1000000,
 					FourCC:          message.FourCCHEVC,
-					HEVCHeader: generateHvcC(formatprocessor.H265DefaultVPS,
-						formatprocessor.H265DefaultSPS, formatprocessor.H265DefaultPPS),
+					HEVCHeader: generateHvcC(codecprocessor.H265DefaultVPS,
+						codecprocessor.H265DefaultSPS, codecprocessor.H265DefaultPPS),
 				}, msg)
 
 				err = w.WriteH265(tracks[0].(*format.H265), 0, 0, [][]byte{{1, 2}})

internal/recorder/format_fmp4.go

@@ -20,8 +20,8 @@ import (
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/mp4"
 
+	"github.com/bluenviron/mediamtx/internal/codecprocessor"
 	"github.com/bluenviron/mediamtx/internal/defs"
-	"github.com/bluenviron/mediamtx/internal/formatprocessor"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
@@ -282,9 +282,9 @@ func (f *formatFMP4) initialize() bool {
 			case *rtspformat.H265:
 				vps, sps, pps := forma.SafeParams()
 				if vps == nil || sps == nil || pps == nil {
-					vps = formatprocessor.H265DefaultVPS
-					sps = formatprocessor.H265DefaultSPS
-					pps = formatprocessor.H265DefaultPPS
+					vps = codecprocessor.H265DefaultVPS
+					sps = codecprocessor.H265DefaultSPS
+					pps = codecprocessor.H265DefaultPPS
 				}
 
 				codec := &mp4.CodecH265{
@@ -372,8 +372,8 @@ func (f *formatFMP4) initialize() bool {
 			case *rtspformat.H264:
 				sps, pps := forma.SafeParams()
 				if sps == nil || pps == nil {
-					sps = formatprocessor.H264DefaultSPS
-					pps = formatprocessor.H264DefaultPPS
+					sps = codecprocessor.H264DefaultSPS
+					pps = codecprocessor.H264DefaultPPS
 				}
 
 				codec := &mp4.CodecH264{
@@ -454,7 +454,7 @@ func (f *formatFMP4) initialize() bool {
 				config := forma.SafeParams()
 
 				if config == nil {
-					config = formatprocessor.MPEG4VideoDefaultConfig
+					config = codecprocessor.MPEG4VideoDefaultConfig
 				}
 
 				codec := &mp4.CodecMPEG4Video{
@@ -512,7 +512,7 @@ func (f *formatFMP4) initialize() bool {
 
 			case *rtspformat.MPEG1Video:
 				codec := &mp4.CodecMPEG1Video{
-					Config: formatprocessor.MPEG1VideoDefaultConfig,
+					Config: codecprocessor.MPEG1VideoDefaultConfig,
 				}
 				track := addTrack(forma, codec)
 

internal/stream/stream_format.go

@@ -8,8 +8,8 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/codecprocessor"
 	"github.com/bluenviron/mediamtx/internal/counterdumper"
-	"github.com/bluenviron/mediamtx/internal/formatprocessor"
 	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
@@ -29,7 +29,7 @@ type streamFormat struct {
 	processingErrors   *counterdumper.CounterDumper
 	parent             logger.Writer
 
-	proc           formatprocessor.Processor
+	proc           codecprocessor.Processor
 	pausedReaders  map[*streamReader]ReadFunc
 	runningReaders map[*streamReader]ReadFunc
 }
@@ -39,7 +39,7 @@ func (sf *streamFormat) initialize() error {
 	sf.runningReaders = make(map[*streamReader]ReadFunc)
 
 	var err error
-	sf.proc, err = formatprocessor.New(sf.rtpMaxPayloadSize, sf.format, sf.generateRTPPackets, sf.parent)
+	sf.proc, err = codecprocessor.New(sf.rtpMaxPayloadSize, sf.format, sf.generateRTPPackets, sf.parent)
 	if err != nil {
 		return err
 	}