h264: support AVCC with empty NALUs

(bluenviron/mediamtx#2375)
bluenviron · Sep 24, 2023 · d914cd1 · d914cd1
1 parent 7fae03f
commit d914cd1
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 17 deletions.
diff --git a/pkg/codecs/h264/avcc.go b/pkg/codecs/h264/avcc.go
@@ -2,6 +2,11 @@ package h264
 
 import (
 	"fmt"
+	"errors"
+)
+
+var (
+	ErrAVCCNoNALUs = errors.New("AVCC doesn't contain any NALU")
 )
 
 // AVCCUnmarshal decodes an access unit from the AVCC stream format.
@@ -21,33 +26,35 @@ func AVCCUnmarshal(buf []byte) ([][]byte, error) {
 		l := int(uint32(buf[pos])<<24 | uint32(buf[pos+1])<<16 | uint32(buf[pos+2])<<8 | uint32(buf[pos+3]))
 		pos += 4
 
-		if l == 0 {
-			return nil, fmt.Errorf("invalid NALU")
-		}
+		if l != 0 {
+			if (auSize + l) > MaxAccessUnitSize {
+				return nil, fmt.Errorf("access unit size (%d) is too big, maximum is %d", auSize+l, MaxAccessUnitSize)
+			}
 
-		if (auSize + l) > MaxAccessUnitSize {
-			return nil, fmt.Errorf("access unit size (%d) is too big, maximum is %d", auSize+l, MaxAccessUnitSize)
-		}
+			if (naluCount + 1) > MaxNALUsPerAccessUnit {
+				return nil, fmt.Errorf("NALU count (%d) exceeds maximum allowed (%d)",
+					len(ret)+1, MaxNALUsPerAccessUnit)
+			}
 
-		if (naluCount + 1) > MaxNALUsPerAccessUnit {
-			return nil, fmt.Errorf("NALU count (%d) exceeds maximum allowed (%d)",
-				len(ret)+1, MaxNALUsPerAccessUnit)
-		}
+			if (bl - pos) < l {
+				return nil, fmt.Errorf("invalid length")
+			}
 
-		if (bl - pos) < l {
-			return nil, fmt.Errorf("invalid length")
+			ret = append(ret, buf[pos:pos+l])
+			auSize += l
+			naluCount++
+			pos += l
 		}
 
-		ret = append(ret, buf[pos:pos+l])
-		auSize += l
-		naluCount++
-		pos += l
-
 		if (bl - pos) == 0 {
 			break
 		}
 	}
 
+	if ret == nil {
+		return nil, ErrAVCCNoNALUs
+	}
+
 	return ret, nil
 }
 

diff --git a/pkg/codecs/h264/avcc_test.go b/pkg/codecs/h264/avcc_test.go
@@ -49,6 +49,28 @@ func TestAVCCUnmarshal(t *testing.T) {
 	}
 }
 
+// issue mediamtx/2375
+func TestAVCCUnmarshalEmpty(t *testing.T) {
+	caenc := []byte{
+		0x0, 0x0, 0x0, 0x0,
+	}
+
+	dec, err = AVCCUnmarshal(caenc)
+	require.Equal(t, ErrAVCCNoNALUs, err)
+	require.Equal(t, [][]byte(nil), dec)
+
+	caenc = []byte{
+		0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x1, 0x2, 0x3,
+	}
+	cadec := [][]byte{
+		{1, 2, 3},
+	}
+
+	dec, err = AVCCUnmarshal(caenc)
+	require.NoError(t, err)
+	require.Equal(t, cadec, dec)
+}
+
 func TestAVCCMarshal(t *testing.T) {
 	for _, ca := range casesAVCC {
 		t.Run(ca.name, func(t *testing.T) {

diff --git a/pkg/formats/fmp4/part_track.go b/pkg/formats/fmp4/part_track.go
@@ -1,6 +1,8 @@
 package fmp4
 
 import (
+	"fmt"
+
 	"github.com/abema/go-mp4"
 
 	"github.com/bluenviron/mediacommon/pkg/codecs/av1"