diff --git a/internal/formatprocessor/ac3.go b/internal/codecprocessor/ac3.go similarity index 98% rename from internal/formatprocessor/ac3.go rename to internal/codecprocessor/ac3.go index 6fe1e985..c99ab378 100644 --- a/internal/formatprocessor/ac3.go +++ b/internal/codecprocessor/ac3.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "errors" diff --git a/internal/formatprocessor/av1.go b/internal/codecprocessor/av1.go similarity index 98% rename from internal/formatprocessor/av1.go rename to internal/codecprocessor/av1.go index b903d4a9..432186d0 100644 --- a/internal/formatprocessor/av1.go +++ b/internal/codecprocessor/av1.go @@ -1,4 +1,4 @@ -package formatprocessor //nolint:dupl +package codecprocessor //nolint:dupl import ( "errors" diff --git a/internal/formatprocessor/av1_test.go b/internal/codecprocessor/av1_test.go similarity index 96% rename from internal/formatprocessor/av1_test.go rename to internal/codecprocessor/av1_test.go index 23d9ea60..f93adc17 100644 --- a/internal/formatprocessor/av1_test.go +++ b/internal/codecprocessor/av1_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "testing" diff --git a/internal/formatprocessor/g711.go b/internal/codecprocessor/g711.go similarity index 98% rename from internal/formatprocessor/g711.go rename to internal/codecprocessor/g711.go index f822dc26..a0f1dd15 100644 --- a/internal/formatprocessor/g711.go +++ b/internal/codecprocessor/g711.go @@ -1,4 +1,4 @@ -package formatprocessor //nolint:dupl +package codecprocessor //nolint:dupl import ( "fmt" diff --git a/internal/formatprocessor/g711_test.go b/internal/codecprocessor/g711_test.go similarity index 98% rename from internal/formatprocessor/g711_test.go rename to internal/codecprocessor/g711_test.go index 3e8ca39a..55df9829 100644 --- a/internal/formatprocessor/g711_test.go +++ b/internal/codecprocessor/g711_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "testing" diff --git a/internal/formatprocessor/generic.go b/internal/codecprocessor/generic.go similarity index 97% rename from internal/formatprocessor/generic.go rename to internal/codecprocessor/generic.go index 6b3e1c06..cbf5b25f 100644 --- a/internal/formatprocessor/generic.go +++ b/internal/codecprocessor/generic.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "fmt" diff --git a/internal/formatprocessor/generic_test.go b/internal/codecprocessor/generic_test.go similarity index 97% rename from internal/formatprocessor/generic_test.go rename to internal/codecprocessor/generic_test.go index 5baeca3c..cd9da583 100644 --- a/internal/formatprocessor/generic_test.go +++ b/internal/codecprocessor/generic_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "testing" diff --git a/internal/formatprocessor/h264.go b/internal/codecprocessor/h264.go similarity index 99% rename from internal/formatprocessor/h264.go rename to internal/codecprocessor/h264.go index 2f478bd7..1ed91bf3 100644 --- a/internal/formatprocessor/h264.go +++ b/internal/codecprocessor/h264.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "bytes" diff --git a/internal/formatprocessor/h264_test.go b/internal/codecprocessor/h264_test.go similarity index 99% rename from internal/formatprocessor/h264_test.go rename to internal/codecprocessor/h264_test.go index 6ee097ea..8ea2e719 100644 --- a/internal/formatprocessor/h264_test.go +++ b/internal/codecprocessor/h264_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "bytes" diff --git a/internal/formatprocessor/h265.go b/internal/codecprocessor/h265.go similarity index 99% rename from internal/formatprocessor/h265.go rename to internal/codecprocessor/h265.go index fe374f4b..916a9766 100644 --- a/internal/formatprocessor/h265.go +++ b/internal/codecprocessor/h265.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "bytes" diff --git a/internal/formatprocessor/h265_test.go b/internal/codecprocessor/h265_test.go similarity index 99% rename from internal/formatprocessor/h265_test.go rename to internal/codecprocessor/h265_test.go index a21330d7..7601d5e3 100644 --- a/internal/formatprocessor/h265_test.go +++ b/internal/codecprocessor/h265_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "bytes" diff --git a/internal/formatprocessor/klv.go b/internal/codecprocessor/klv.go similarity index 98% rename from internal/formatprocessor/klv.go rename to internal/codecprocessor/klv.go index 571091ae..3e958bba 100644 --- a/internal/formatprocessor/klv.go +++ b/internal/codecprocessor/klv.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "fmt" diff --git a/internal/formatprocessor/klv_test.go b/internal/codecprocessor/klv_test.go similarity index 98% rename from internal/formatprocessor/klv_test.go rename to internal/codecprocessor/klv_test.go index 4e46a458..ff35e48d 100644 --- a/internal/formatprocessor/klv_test.go +++ b/internal/codecprocessor/klv_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "testing" diff --git a/internal/formatprocessor/lpcm.go b/internal/codecprocessor/lpcm.go similarity index 98% rename from internal/formatprocessor/lpcm.go rename to internal/codecprocessor/lpcm.go index a22d8ac3..04ecd6d6 100644 --- a/internal/formatprocessor/lpcm.go +++ b/internal/codecprocessor/lpcm.go @@ -1,4 +1,4 @@ -package formatprocessor //nolint:dupl +package codecprocessor //nolint:dupl import ( "fmt" diff --git a/internal/formatprocessor/lpcm_test.go b/internal/codecprocessor/lpcm_test.go similarity index 97% rename from internal/formatprocessor/lpcm_test.go rename to internal/codecprocessor/lpcm_test.go index 1ff3122a..3d11ac90 100644 --- a/internal/formatprocessor/lpcm_test.go +++ b/internal/codecprocessor/lpcm_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "testing" diff --git a/internal/formatprocessor/mjpeg.go b/internal/codecprocessor/mjpeg.go similarity index 98% rename from internal/formatprocessor/mjpeg.go rename to internal/codecprocessor/mjpeg.go index a8dbf8bb..1df30f47 100644 --- a/internal/formatprocessor/mjpeg.go +++ b/internal/codecprocessor/mjpeg.go @@ -1,4 +1,4 @@ -package formatprocessor //nolint:dupl +package codecprocessor //nolint:dupl import ( "errors" diff --git a/internal/formatprocessor/mpeg1_audio.go b/internal/codecprocessor/mpeg1_audio.go similarity index 98% rename from internal/formatprocessor/mpeg1_audio.go rename to internal/codecprocessor/mpeg1_audio.go index 3a4a6340..6ef4cff7 100644 --- a/internal/formatprocessor/mpeg1_audio.go +++ b/internal/codecprocessor/mpeg1_audio.go @@ -1,4 +1,4 @@ -package formatprocessor //nolint:dupl +package codecprocessor //nolint:dupl import ( "errors" diff --git a/internal/formatprocessor/mpeg1_video.go b/internal/codecprocessor/mpeg1_video.go similarity index 98% rename from internal/formatprocessor/mpeg1_video.go rename to internal/codecprocessor/mpeg1_video.go index 40250ec8..e5d9b53e 100644 --- a/internal/formatprocessor/mpeg1_video.go +++ b/internal/codecprocessor/mpeg1_video.go @@ -1,4 +1,4 @@ -package formatprocessor //nolint:dupl +package codecprocessor //nolint:dupl import ( "errors" diff --git a/internal/formatprocessor/mpeg4_audio.go b/internal/codecprocessor/mpeg4_audio.go similarity index 98% rename from internal/formatprocessor/mpeg4_audio.go rename to internal/codecprocessor/mpeg4_audio.go index 3b7a7b0f..7e1f757c 100644 --- a/internal/formatprocessor/mpeg4_audio.go +++ b/internal/codecprocessor/mpeg4_audio.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "errors" diff --git a/internal/formatprocessor/mpeg4_audio_latm.go b/internal/codecprocessor/mpeg4_audio_latm.go similarity index 98% rename from internal/formatprocessor/mpeg4_audio_latm.go rename to internal/codecprocessor/mpeg4_audio_latm.go index 73e004f1..d3333429 100644 --- a/internal/formatprocessor/mpeg4_audio_latm.go +++ b/internal/codecprocessor/mpeg4_audio_latm.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "errors" diff --git a/internal/formatprocessor/mpeg4_video.go b/internal/codecprocessor/mpeg4_video.go similarity index 98% rename from internal/formatprocessor/mpeg4_video.go rename to internal/codecprocessor/mpeg4_video.go index 9d65660f..f8483358 100644 --- a/internal/formatprocessor/mpeg4_video.go +++ b/internal/codecprocessor/mpeg4_video.go @@ -1,4 +1,4 @@ -package formatprocessor //nolint:dupl +package codecprocessor //nolint:dupl import ( "bytes" diff --git a/internal/formatprocessor/mpeg4_video_test.go b/internal/codecprocessor/mpeg4_video_test.go similarity index 98% rename from internal/formatprocessor/mpeg4_video_test.go rename to internal/codecprocessor/mpeg4_video_test.go index 082fd794..810022e9 100644 --- a/internal/formatprocessor/mpeg4_video_test.go +++ b/internal/codecprocessor/mpeg4_video_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "testing" diff --git a/internal/formatprocessor/opus.go b/internal/codecprocessor/opus.go similarity index 98% rename from internal/formatprocessor/opus.go rename to internal/codecprocessor/opus.go index f6f67ee1..153cb964 100644 --- a/internal/formatprocessor/opus.go +++ b/internal/codecprocessor/opus.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "fmt" diff --git a/internal/formatprocessor/opus_test.go b/internal/codecprocessor/opus_test.go similarity index 99% rename from internal/formatprocessor/opus_test.go rename to internal/codecprocessor/opus_test.go index 79a6e19d..58d91634 100644 --- a/internal/formatprocessor/opus_test.go +++ b/internal/codecprocessor/opus_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "testing" diff --git a/internal/formatprocessor/processor.go b/internal/codecprocessor/processor.go similarity index 95% rename from internal/formatprocessor/processor.go rename to internal/codecprocessor/processor.go index e35f6532..a6595823 100644 --- a/internal/formatprocessor/processor.go +++ b/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 diff --git a/internal/formatprocessor/processor_test.go b/internal/codecprocessor/processor_test.go similarity index 98% rename from internal/formatprocessor/processor_test.go rename to internal/codecprocessor/processor_test.go index 6920c0b0..06211bb1 100644 --- a/internal/formatprocessor/processor_test.go +++ b/internal/codecprocessor/processor_test.go @@ -1,4 +1,4 @@ -package formatprocessor +package codecprocessor import ( "testing" diff --git a/internal/formatprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/048b606517c23baf b/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/048b606517c23baf similarity index 100% rename from internal/formatprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/048b606517c23baf rename to internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/048b606517c23baf diff --git a/internal/formatprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/32e7782636603e29 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/32e7782636603e29 similarity index 100% rename from internal/formatprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/32e7782636603e29 rename to internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/32e7782636603e29 diff --git a/internal/formatprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/caf81e9797b19c76 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/caf81e9797b19c76 similarity index 100% rename from internal/formatprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/caf81e9797b19c76 rename to internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/caf81e9797b19c76 diff --git a/internal/formatprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/f428976a5b2917c0 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/f428976a5b2917c0 similarity index 100% rename from internal/formatprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/f428976a5b2917c0 rename to internal/codecprocessor/testdata/fuzz/FuzzRTPH264ExtractSPSPPS/f428976a5b2917c0 diff --git a/internal/formatprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/353ba911ad2dc191 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/353ba911ad2dc191 similarity index 100% rename from internal/formatprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/353ba911ad2dc191 rename to internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/353ba911ad2dc191 diff --git a/internal/formatprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/3c3a72c00adac0b3 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/3c3a72c00adac0b3 similarity index 100% rename from internal/formatprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/3c3a72c00adac0b3 rename to internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/3c3a72c00adac0b3 diff --git a/internal/formatprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/582528ddfad69eb5 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/582528ddfad69eb5 similarity index 100% rename from internal/formatprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/582528ddfad69eb5 rename to internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/582528ddfad69eb5 diff --git a/internal/formatprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/c4389a565e828050 b/internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/c4389a565e828050 similarity index 100% rename from internal/formatprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/c4389a565e828050 rename to internal/codecprocessor/testdata/fuzz/FuzzRTPH265ExtractParams/c4389a565e828050 diff --git a/internal/formatprocessor/vp8.go b/internal/codecprocessor/vp8.go similarity index 98% rename from internal/formatprocessor/vp8.go rename to internal/codecprocessor/vp8.go index 3d28ec14..856b487a 100644 --- a/internal/formatprocessor/vp8.go +++ b/internal/codecprocessor/vp8.go @@ -1,4 +1,4 @@ -package formatprocessor //nolint:dupl +package codecprocessor //nolint:dupl import ( "errors" diff --git a/internal/formatprocessor/vp9.go b/internal/codecprocessor/vp9.go similarity index 98% rename from internal/formatprocessor/vp9.go rename to internal/codecprocessor/vp9.go index 5ed76706..3787d1ea 100644 --- a/internal/formatprocessor/vp9.go +++ b/internal/codecprocessor/vp9.go @@ -1,4 +1,4 @@ -package formatprocessor //nolint:dupl +package codecprocessor //nolint:dupl import ( "errors" diff --git a/internal/protocols/rtmp/from_stream_test.go b/internal/protocols/rtmp/from_stream_test.go index 4f46136e..76467147 100644 --- a/internal/protocols/rtmp/from_stream_test.go +++ b/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 }, }) diff --git a/internal/protocols/rtmp/writer.go b/internal/protocols/rtmp/writer.go index 657fd594..0c094c75 100644 --- a/internal/protocols/rtmp/writer.go +++ b/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 { diff --git a/internal/protocols/rtmp/writer_test.go b/internal/protocols/rtmp/writer_test.go index 2bf2f773..76325f3c 100644 --- a/internal/protocols/rtmp/writer_test.go +++ b/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}}) diff --git a/internal/recorder/format_fmp4.go b/internal/recorder/format_fmp4.go index 95a113f7..35ce6e10 100644 --- a/internal/recorder/format_fmp4.go +++ b/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) diff --git a/internal/stream/stream_format.go b/internal/stream/stream_format.go index c68e0d75..87c08e96 100644 --- a/internal/stream/stream_format.go +++ b/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 }