improve NALU size limit errors

Author: aler9

pkg/format/rtpav1/decoder.go

@@ -140,11 +140,12 @@ func (d *Decoder) Decode(pkt *rtp.Packet) ([][]byte, error) {
 	l := len(obus)
 
 	if (d.frameBufferLen + l) > av1.MaxOBUsPerTemporalUnit {
+		errCount := d.frameBufferLen + l
 		d.frameBuffer = nil
 		d.frameBufferLen = 0
 		d.frameBufferSize = 0
-		return nil, fmt.Errorf("OBU count exceeds maximum allowed (%d)",
-			av1.MaxOBUsPerTemporalUnit)
+		return nil, fmt.Errorf("OBU count (%d) exceeds maximum allowed (%d)",
+			errCount, av1.MaxOBUsPerTemporalUnit)
 	}
 
 	addSize := 0

pkg/format/rtpav1/decoder_test.go

@@ -52,7 +52,7 @@ func TestDecoderErrorLimit(t *testing.T) {
 		})
 	}
 
-	require.EqualError(t, err, "OBU count exceeds maximum allowed (10)")
+	require.EqualError(t, err, "OBU count (11) exceeds maximum allowed (10)")
 }
 
 func TestDecodeErrorMissingPacket(t *testing.T) {

pkg/format/rtph264/decoder.go

@@ -213,11 +213,12 @@ func (d *Decoder) Decode(pkt *rtp.Packet) ([][]byte, error) {
 	l := len(nalus)
 
 	if (d.frameBufferLen + l) > h264.MaxNALUsPerAccessUnit {
+		errCount := d.frameBufferLen + l
 		d.frameBuffer = nil
 		d.frameBufferLen = 0
 		d.frameBufferSize = 0
-		return nil, fmt.Errorf("NALU count exceeds maximum allowed (%d)",
-			h264.MaxNALUsPerAccessUnit)
+		return nil, fmt.Errorf("NALU count (%d) exceeds maximum allowed (%d)",
+			errCount, h264.MaxNALUsPerAccessUnit)
 	}
 
 	addSize := 0

pkg/format/rtph264/decoder_test.go

@@ -241,7 +241,7 @@ func TestDecoderErrorLimit(t *testing.T) {
 		})
 	}
 
-	require.EqualError(t, err, "NALU count exceeds maximum allowed (25)")
+	require.EqualError(t, err, "NALU count (26) exceeds maximum allowed (25)")
 }
 
 func TestDecodeErrorMissingPacket(t *testing.T) {

pkg/format/rtph265/decoder.go

@@ -172,11 +172,12 @@ func (d *Decoder) Decode(pkt *rtp.Packet) ([][]byte, error) {
 	l := len(nalus)
 
 	if (d.frameBufferLen + l) > h265.MaxNALUsPerAccessUnit {
+		errCount := d.frameBufferLen + l
 		d.frameBuffer = nil
 		d.frameBufferLen = 0
 		d.frameBufferSize = 0
-		return nil, fmt.Errorf("NALU count exceeds maximum allowed (%d)",
-			h265.MaxNALUsPerAccessUnit)
+		return nil, fmt.Errorf("NALU count (%d) exceeds maximum allowed (%d)",
+			errCount, h265.MaxNALUsPerAccessUnit)
 	}
 
 	addSize := 0

pkg/format/rtph265/decoder_test.go

@@ -58,7 +58,7 @@ func TestDecoderErrorLimit(t *testing.T) {
 		})
 	}
 
-	require.EqualError(t, err, "NALU count exceeds maximum allowed (21)")
+	require.EqualError(t, err, "NALU count (22) exceeds maximum allowed (21)")
 }
 
 func TestDecodeErrorMissingPacket(t *testing.T) {