fix crash when processing H265 (#2378) (#2381)

internal/formatprocessor/h264_test.go

@@ -14,53 +14,68 @@ import (
 )
 
 func TestH264DynamicParams(t *testing.T) {
-	forma := &format.H264{
+	for _, ca := range []string{"standard", "aggregated"} {
-		PayloadTyp:        96,
+		t.Run(ca, func(t *testing.T) {
-		PacketizationMode: 1,
+			forma := &format.H264{
+				PayloadTyp:        96,
+				PacketizationMode: 1,
+			}
+
+			p, err := New(1472, forma, false)
+			require.NoError(t, err)
+
+			enc, err := forma.CreateEncoder()
+			require.NoError(t, err)
+
+			pkts, err := enc.Encode([][]byte{{byte(h264.NALUTypeIDR)}})
+			require.NoError(t, err)
+
+			data, err := p.ProcessRTPPacket(pkts[0], time.Time{}, 0, true)
+			require.NoError(t, err)
+
+			require.Equal(t, [][]byte{
+				{byte(h264.NALUTypeIDR)},
+			}, data.(*unit.H264).AU)
+
+			if ca == "standard" {
+				pkts, err = enc.Encode([][]byte{{7, 4, 5, 6}}) // SPS
+				require.NoError(t, err)
+
+				_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
+				require.NoError(t, err)
+
+				pkts, err = enc.Encode([][]byte{{8, 1}}) // PPS
+				require.NoError(t, err)
+
+				_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
+				require.NoError(t, err)
+			} else {
+				pkts, err = enc.Encode([][]byte{
+					{7, 4, 5, 6}, // SPS
+					{8, 1},       // PPS
+				})
+				require.NoError(t, err)
+
+				_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
+				require.NoError(t, err)
+			}
+
+			require.Equal(t, []byte{7, 4, 5, 6}, forma.SPS)
+			require.Equal(t, []byte{8, 1}, forma.PPS)
+
+			pkts, err = enc.Encode([][]byte{{byte(h264.NALUTypeIDR)}})
+			require.NoError(t, err)
+
+			data, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, true)
+			require.NoError(t, err)
+
+			require.Equal(t, [][]byte{
+				{0x07, 4, 5, 6},
+				{0x08, 1},
+				{byte(h264.NALUTypeIDR)},
+			}, data.(*unit.H264).AU)
+		})
 	}
-
-	p, err := New(1472, forma, false)
-	require.NoError(t, err)
-
-	enc, err := forma.CreateEncoder()
-	require.NoError(t, err)
-
-	pkts, err := enc.Encode([][]byte{{byte(h264.NALUTypeIDR)}})
-	require.NoError(t, err)
-
-	data, err := p.ProcessRTPPacket(pkts[0], time.Time{}, 0, true)
-	require.NoError(t, err)
-
-	require.Equal(t, [][]byte{
-		{byte(h264.NALUTypeIDR)},
-	}, data.(*unit.H264).AU)
-
-	pkts, err = enc.Encode([][]byte{{7, 4, 5, 6}}) // SPS
-	require.NoError(t, err)
-
-	_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
-	require.NoError(t, err)
-
-	pkts, err = enc.Encode([][]byte{{8, 1}}) // PPS
-	require.NoError(t, err)
-
-	_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
-	require.NoError(t, err)
-
-	require.Equal(t, []byte{7, 4, 5, 6}, forma.SPS)
-	require.Equal(t, []byte{8, 1}, forma.PPS)
-
-	pkts, err = enc.Encode([][]byte{{byte(h264.NALUTypeIDR)}})
-	require.NoError(t, err)
-
-	data, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, true)
-	require.NoError(t, err)
-
-	require.Equal(t, [][]byte{
-		{0x07, 4, 5, 6},
-		{0x08, 1},
-		{byte(h264.NALUTypeIDR)},
-	}, data.(*unit.H264).AU)
 }
 
 func TestH264OversizedPackets(t *testing.T) {

internal/formatprocessor/h265.go

@@ -55,7 +55,7 @@ func rtpH265ExtractVPSSPSPPS(payload []byte) ([]byte, []byte, []byte) {
 			nalu := payload[:size]
 			payload = payload[size:]
 
-			typ = h265.NALUType((payload[0] >> 1) & 0b111111)
+			typ = h265.NALUType((nalu[0] >> 1) & 0b111111)
 
 			switch typ {
 			case h265.NALUType_VPS_NUT:

internal/formatprocessor/h265_test.go

@@ -14,60 +14,76 @@ import (
 )
 
 func TestH265DynamicParams(t *testing.T) {
-	forma := &format.H265{
+	for _, ca := range []string{"standard", "aggregated"} {
-		PayloadTyp: 96,
+		t.Run(ca, func(t *testing.T) {
+			forma := &format.H265{
+				PayloadTyp: 96,
+			}
+
+			p, err := New(1472, forma, false)
+			require.NoError(t, err)
+
+			enc, err := forma.CreateEncoder()
+			require.NoError(t, err)
+
+			pkts, err := enc.Encode([][]byte{{byte(h265.NALUType_CRA_NUT) << 1, 0}})
+			require.NoError(t, err)
+
+			data, err := p.ProcessRTPPacket(pkts[0], time.Time{}, 0, true)
+			require.NoError(t, err)
+
+			require.Equal(t, [][]byte{
+				{byte(h265.NALUType_CRA_NUT) << 1, 0},
+			}, data.(*unit.H265).AU)
+
+			if ca == "standard" {
+				pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3}})
+				require.NoError(t, err)
+
+				_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
+				require.NoError(t, err)
+
+				pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6}})
+				require.NoError(t, err)
+
+				_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
+				require.NoError(t, err)
+
+				pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9}})
+				require.NoError(t, err)
+
+				_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
+				require.NoError(t, err)
+			} else {
+				pkts, err = enc.Encode([][]byte{
+					{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3},
+					{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6},
+					{byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9},
+				})
+				require.NoError(t, err)
+
+				_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
+				require.NoError(t, err)
+			}
+
+			require.Equal(t, []byte{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3}, forma.VPS)
+			require.Equal(t, []byte{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6}, forma.SPS)
+			require.Equal(t, []byte{byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9}, forma.PPS)
+
+			pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_CRA_NUT) << 1, 0}})
+			require.NoError(t, err)
+
+			data, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, true)
+			require.NoError(t, err)
+
+			require.Equal(t, [][]byte{
+				{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3},
+				{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6},
+				{byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9},
+				{byte(h265.NALUType_CRA_NUT) << 1, 0},
+			}, data.(*unit.H265).AU)
+		})
 	}
-
-	p, err := New(1472, forma, false)
-	require.NoError(t, err)
-
-	enc, err := forma.CreateEncoder()
-	require.NoError(t, err)
-
-	pkts, err := enc.Encode([][]byte{{byte(h265.NALUType_CRA_NUT) << 1, 0}})
-	require.NoError(t, err)
-
-	data, err := p.ProcessRTPPacket(pkts[0], time.Time{}, 0, true)
-	require.NoError(t, err)
-
-	require.Equal(t, [][]byte{
-		{byte(h265.NALUType_CRA_NUT) << 1, 0},
-	}, data.(*unit.H265).AU)
-
-	pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3}})
-	require.NoError(t, err)
-
-	_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
-	require.NoError(t, err)
-
-	pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6}})
-	require.NoError(t, err)
-
-	_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
-	require.NoError(t, err)
-
-	pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9}})
-	require.NoError(t, err)
-
-	_, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, false)
-	require.NoError(t, err)
-
-	require.Equal(t, []byte{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3}, forma.VPS)
-	require.Equal(t, []byte{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6}, forma.SPS)
-	require.Equal(t, []byte{byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9}, forma.PPS)
-
-	pkts, err = enc.Encode([][]byte{{byte(h265.NALUType_CRA_NUT) << 1, 0}})
-	require.NoError(t, err)
-
-	data, err = p.ProcessRTPPacket(pkts[0], time.Time{}, 0, true)
-	require.NoError(t, err)
-
-	require.Equal(t, [][]byte{
-		{byte(h265.NALUType_VPS_NUT) << 1, 1, 2, 3},
-		{byte(h265.NALUType_SPS_NUT) << 1, 4, 5, 6},
-		{byte(h265.NALUType_PPS_NUT) << 1, 7, 8, 9},
-		{byte(h265.NALUType_CRA_NUT) << 1, 0},
-	}, data.(*unit.H265).AU)
 }
 
 func TestH265OversizedPackets(t *testing.T) {