rtsp: emit log message when remuxing RTP packets (#4422)

internal/formatprocessor/ac3.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtpac3"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -16,6 +17,7 @@ type ac3 struct {
 	UDPMaxPayloadSize  int
 	Format             *format.AC3
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpac3.Encoder
 	decoder     *rtpac3.Decoder

internal/formatprocessor/av1.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtpav1"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -23,6 +24,7 @@ type av1 struct {
 	UDPMaxPayloadSize  int
 	Format             *format.AV1
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpav1.Encoder
 	decoder     *rtpav1.Decoder

internal/formatprocessor/g711.go

@@ -8,6 +8,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtplpcm"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -15,6 +16,7 @@ type g711 struct {
 	UDPMaxPayloadSize  int
 	Format             *format.G711
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtplpcm.Encoder
 	decoder     *rtplpcm.Decoder

internal/formatprocessor/g711_test.go

@@ -18,7 +18,7 @@ func TestG711Encode(t *testing.T) {
 			ChannelCount: 1,
 		}
 
-		p, err := New(1472, forma, true)
+		p, err := New(1472, forma, true, nil)
 		require.NoError(t, err)
 
 		unit := &unit.G711{
@@ -47,7 +47,7 @@ func TestG711Encode(t *testing.T) {
 			ChannelCount: 1,
 		}
 
-		p, err := New(1472, forma, true)
+		p, err := New(1472, forma, true, nil)
 		require.NoError(t, err)
 
 		unit := &unit.G711{

internal/formatprocessor/generic.go

@@ -7,6 +7,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -14,6 +15,7 @@ type generic struct {
 	UDPMaxPayloadSize  int
 	Format             format.Format
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 }
 
 func (t *generic) initialize() error {

internal/formatprocessor/generic_test.go

@@ -17,7 +17,7 @@ func TestGenericRemovePadding(t *testing.T) {
 	err := forma.Init()
 	require.NoError(t, err)
 
-	p, err := New(1472, forma, false)
+	p, err := New(1472, forma, false, nil)
 	require.NoError(t, err)
 
 	pkt := &rtp.Packet{

internal/formatprocessor/h264.go

@@ -10,6 +10,7 @@ import (
 	mch264 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -85,6 +86,7 @@ type h264 struct {
 	UDPMaxPayloadSize  int
 	Format             *format.H264
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtph264.Encoder
 	decoder     *rtph264.Decoder
@@ -266,6 +268,8 @@ func (t *h264) ProcessRTPPacket( //nolint:dupl
 
 		// RTP packets exceed maximum size: start re-encoding them
 		if pkt.MarshalSize() > t.UDPMaxPayloadSize {
+			t.Parent.Log(logger.Info, "RTP packets are too big, remuxing them into smaller ones")
+
 			v1 := pkt.SSRC
 			v2 := pkt.SequenceNumber
 			err := t.createEncoder(&v1, &v2)

internal/formatprocessor/h264_test.go

@@ -2,6 +2,7 @@ package formatprocessor
 
 import (
 	"bytes"
+	"fmt"
 	"testing"
 	"time"
 
@@ -10,9 +11,23 @@ import (
 	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
+type testLogger struct {
+	cb func(level logger.Level, format string, args ...interface{})
+}
+
+func (l *testLogger) Log(level logger.Level, format string, args ...interface{}) {
+	l.cb(level, format, args...)
+}
+
+// Logger returns a dummy logger.
+func Logger(cb func(logger.Level, string, ...interface{})) logger.Writer {
+	return &testLogger{cb: cb}
+}
+
 func TestH264DynamicParams(t *testing.T) {
 	for _, ca := range []string{"standard", "aggregated"} {
 		t.Run(ca, func(t *testing.T) {
@@ -21,7 +36,7 @@ func TestH264DynamicParams(t *testing.T) {
 				PacketizationMode: 1,
 			}
 
-			p, err := New(1472, forma, false)
+			p, err := New(1472, forma, false, nil)
 			require.NoError(t, err)
 
 			enc, err := forma.CreateEncoder()
@@ -86,7 +101,13 @@ func TestH264OversizedPackets(t *testing.T) {
 		PacketizationMode: 1,
 	}
 
-	p, err := New(1472, forma, false)
+	logged := false
+
+	p, err := New(1472, forma, false,
+		Logger(func(_ logger.Level, s string, i ...interface{}) {
+			require.Equal(t, "RTP packets are too big, remuxing them into smaller ones", fmt.Sprintf(s, i...))
+			logged = true
+		}))
 	require.NoError(t, err)
 
 	var out []*rtp.Packet
@@ -176,6 +197,8 @@ func TestH264OversizedPackets(t *testing.T) {
 			),
 		},
 	}, out)
+
+	require.True(t, logged)
 }
 
 func TestH264EmptyPacket(t *testing.T) {
@@ -184,7 +207,7 @@ func TestH264EmptyPacket(t *testing.T) {
 		PacketizationMode: 1,
 	}
 
-	p, err := New(1472, forma, true)
+	p, err := New(1472, forma, true, nil)
 	require.NoError(t, err)
 
 	unit := &unit.H264{

internal/formatprocessor/h265.go

@@ -10,6 +10,7 @@ import (
 	mch265 "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -105,6 +106,7 @@ type h265 struct {
 	UDPMaxPayloadSize  int
 	Format             *format.H265
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtph265.Encoder
 	decoder     *rtph265.Decoder
@@ -298,6 +300,8 @@ func (t *h265) ProcessRTPPacket( //nolint:dupl
 
 		// RTP packets exceed maximum size: start re-encoding them
 		if pkt.MarshalSize() > t.UDPMaxPayloadSize {
+			t.Parent.Log(logger.Info, "RTP packets are too big, remuxing them into smaller ones")
+
 			v1 := pkt.SSRC
 			v2 := pkt.SequenceNumber
 			err := t.createEncoder(&v1, &v2)

internal/formatprocessor/h265_test.go

@@ -2,6 +2,7 @@ package formatprocessor
 
 import (
 	"bytes"
+	"fmt"
 	"testing"
 	"time"
 
@@ -10,6 +11,7 @@ import (
 	"github.com/pion/rtp"
 	"github.com/stretchr/testify/require"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -20,7 +22,7 @@ func TestH265DynamicParams(t *testing.T) {
 				PayloadTyp: 96,
 			}
 
-			p, err := New(1472, forma, false)
+			p, err := New(1472, forma, false, nil)
 			require.NoError(t, err)
 
 			enc, err := forma.CreateEncoder()
@@ -94,7 +96,13 @@ func TestH265OversizedPackets(t *testing.T) {
 		PPS:        []byte{byte(mch265.NALUType_PPS_NUT) << 1, 16, 17, 18},
 	}
 
-	p, err := New(1472, forma, false)
+	logged := false
+
+	p, err := New(1472, forma, false,
+		Logger(func(_ logger.Level, s string, i ...interface{}) {
+			require.Equal(t, "RTP packets are too big, remuxing them into smaller ones", fmt.Sprintf(s, i...))
+			logged = true
+		}))
 	require.NoError(t, err)
 
 	var out []*rtp.Packet
@@ -172,6 +180,8 @@ func TestH265OversizedPackets(t *testing.T) {
 			),
 		},
 	}, out)
+
+	require.True(t, logged)
 }
 
 func TestH265EmptyPacket(t *testing.T) {
@@ -179,7 +189,7 @@ func TestH265EmptyPacket(t *testing.T) {
 		PayloadTyp: 96,
 	}
 
-	p, err := New(1472, forma, true)
+	p, err := New(1472, forma, true, nil)
 	require.NoError(t, err)
 
 	unit := &unit.H265{

internal/formatprocessor/lpcm.go

@@ -8,6 +8,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtplpcm"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -15,6 +16,7 @@ type lpcm struct {
 	UDPMaxPayloadSize  int
 	Format             *format.LPCM
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtplpcm.Encoder
 	decoder     *rtplpcm.Decoder

internal/formatprocessor/lpcm_test.go

@@ -17,7 +17,7 @@ func TestLPCMEncode(t *testing.T) {
 		ChannelCount: 2,
 	}
 
-	p, err := New(1472, forma, true)
+	p, err := New(1472, forma, true, nil)
 	require.NoError(t, err)
 
 	unit := &unit.LPCM{

internal/formatprocessor/mjpeg.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtpmjpeg"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -16,6 +17,7 @@ type mjpeg struct {
 	UDPMaxPayloadSize  int
 	Format             *format.MJPEG
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpmjpeg.Encoder
 	decoder     *rtpmjpeg.Decoder

internal/formatprocessor/mpeg1_audio.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtpmpeg1audio"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -16,6 +17,7 @@ type mpeg1Audio struct {
 	UDPMaxPayloadSize  int
 	Format             *format.MPEG1Audio
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpmpeg1audio.Encoder
 	decoder     *rtpmpeg1audio.Decoder

internal/formatprocessor/mpeg1_video.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtpmpeg1video"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -25,6 +26,7 @@ type mpeg1Video struct {
 	UDPMaxPayloadSize  int
 	Format             *format.MPEG1Video
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpmpeg1video.Encoder
 	decoder     *rtpmpeg1video.Decoder

internal/formatprocessor/mpeg4_audio.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtpmpeg4audio"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -16,6 +17,7 @@ type mpeg4Audio struct {
 	UDPMaxPayloadSize  int
 	Format             *format.MPEG4Audio
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpmpeg4audio.Encoder
 	decoder     *rtpmpeg4audio.Decoder

internal/formatprocessor/mpeg4_video.go

@@ -11,6 +11,7 @@ import (
 	"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -30,6 +31,7 @@ type mpeg4Video struct {
 	UDPMaxPayloadSize  int
 	Format             *format.MPEG4Video
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpmpeg4video.Encoder
 	decoder     *rtpmpeg4video.Decoder

internal/formatprocessor/opus.go

@@ -9,6 +9,7 @@ import (
 	mcopus "github.com/bluenviron/mediacommon/v2/pkg/codecs/opus"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -16,6 +17,7 @@ type opus struct {
 	UDPMaxPayloadSize  int
 	Format             *format.Opus
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpsimpleaudio.Encoder
 	decoder     *rtpsimpleaudio.Decoder

internal/formatprocessor/opus_test.go

@@ -15,7 +15,7 @@ func TestOpusEncode(t *testing.T) {
 		ChannelCount: 2,
 	}
 
-	p, err := New(1472, forma, true)
+	p, err := New(1472, forma, true, nil)
 	require.NoError(t, err)
 
 	unit := &unit.Opus{

internal/formatprocessor/processor.go

@@ -8,6 +8,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -41,6 +42,7 @@ func New(
 	udpMaxPayloadSize int,
 	forma format.Format,
 	generateRTPPackets bool,
+	parent logger.Writer,
 ) (Processor, error) {
 	var proc Processor
 
@@ -50,6 +52,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.VP9:
@@ -57,6 +60,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.VP8:
@@ -64,6 +68,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.H265:
@@ -71,6 +76,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.H264:
@@ -78,6 +84,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.MPEG4Video:
@@ -85,6 +92,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.MPEG1Video:
@@ -92,6 +100,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.MJPEG:
@@ -99,6 +108,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.Opus:
@@ -106,6 +116,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.MPEG4Audio:
@@ -113,6 +124,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.MPEG1Audio:
@@ -120,6 +132,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.AC3:
@@ -127,6 +140,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.G711:
@@ -134,6 +148,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	case *format.LPCM:
@@ -141,6 +156,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 
 	default:
@@ -148,6 +164,7 @@ func New(
 			UDPMaxPayloadSize:  udpMaxPayloadSize,
 			Format:             forma,
 			GenerateRTPPackets: generateRTPPackets,
+			Parent:             parent,
 		}
 	}
 

internal/formatprocessor/processor_test.go

@@ -90,7 +90,7 @@ func TestNew(t *testing.T) {
 		},
 	} {
 		t.Run(ca.name, func(t *testing.T) {
-			p, err := New(1472, ca.in, false)
+			p, err := New(1472, ca.in, false, nil)
 			require.NoError(t, err)
 			require.IsType(t, ca.out, p)
 		})

internal/formatprocessor/vp8.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtpvp8"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -16,6 +17,7 @@ type vp8 struct {
 	UDPMaxPayloadSize  int
 	Format             *format.VP8
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpvp8.Encoder
 	decoder     *rtpvp8.Decoder

internal/formatprocessor/vp9.go

@@ -9,6 +9,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/format/rtpvp9"
 	"github.com/pion/rtp"
 
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -16,6 +17,7 @@ type vp9 struct {
 	UDPMaxPayloadSize  int
 	Format             *format.VP9
 	GenerateRTPPackets bool
+	Parent             logger.Writer
 
 	encoder     *rtpvp9.Encoder
 	decoder     *rtpvp9.Decoder

internal/stream/stream.go

@@ -73,6 +73,7 @@ func (s *Stream) Initialize() error {
 			media:              media,
 			generateRTPPackets: s.GenerateRTPPackets,
 			processingErrors:   s.processingErrors,
+			parent:             s.Parent,
 		}
 		err := s.streamMedias[media].initialize()
 		if err != nil {

internal/stream/stream_format.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/bluenviron/mediamtx/internal/counterdumper"
 	"github.com/bluenviron/mediamtx/internal/formatprocessor"
+	"github.com/bluenviron/mediamtx/internal/logger"
 	"github.com/bluenviron/mediamtx/internal/unit"
 )
 
@@ -26,6 +27,7 @@ type streamFormat struct {
 	format             format.Format
 	generateRTPPackets bool
 	processingErrors   *counterdumper.CounterDumper
+	parent             logger.Writer
 
 	proc           formatprocessor.Processor
 	pausedReaders  map[*streamReader]ReadFunc
@@ -37,7 +39,7 @@ func (sf *streamFormat) initialize() error {
 	sf.runningReaders = make(map[*streamReader]ReadFunc)
 
 	var err error
-	sf.proc, err = formatprocessor.New(sf.udpMaxPayloadSize, sf.format, sf.generateRTPPackets)
+	sf.proc, err = formatprocessor.New(sf.udpMaxPayloadSize, sf.format, sf.generateRTPPackets, sf.parent)
 	if err != nil {
 		return err
 	}

internal/stream/stream_media.go

@@ -4,6 +4,7 @@ import (
 	"github.com/bluenviron/gortsplib/v4/pkg/description"
 	"github.com/bluenviron/gortsplib/v4/pkg/format"
 	"github.com/bluenviron/mediamtx/internal/counterdumper"
+	"github.com/bluenviron/mediamtx/internal/logger"
 )
 
 type streamMedia struct {
@@ -11,6 +12,7 @@ type streamMedia struct {
 	media              *description.Media
 	generateRTPPackets bool
 	processingErrors   *counterdumper.CounterDumper
+	parent             logger.Writer
 
 	formats map[format.Format]*streamFormat
 }
@@ -24,6 +26,7 @@ func (sm *streamMedia) initialize() error {
 			format:             forma,
 			generateRTPPackets: sm.generateRTPPackets,
 			processingErrors:   sm.processingErrors,
+			parent:             sm.parent,
 		}
 		err := sf.initialize()
 		if err != nil {