Fix panic with only audio for MP4/MSE #404

pkg/mp4/consumer.go

@@ -22,7 +22,7 @@ type Consumer struct {
 
 	muxer *Muxer
 	mu    sync.Mutex
-	wait  byte
+	state byte
 
 	send int
 }
@@ -60,18 +60,16 @@ func (c *Consumer) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiv
 
 	switch track.Codec.Name {
 	case core.CodecH264:
-		c.wait = waitInit
-
 		handler.Handler = func(packet *rtp.Packet) {
 			if packet.Version != h264.RTPPacketVersionAVC {
 				return
 			}
 
-			if c.wait != waitNone {
+			if c.state != stateStart {
-				if c.wait == waitInit || !h264.IsKeyframe(packet.Payload) {
+				if c.state != stateInit || !h264.IsKeyframe(packet.Payload) {
 					return
 				}
-				c.wait = waitNone
+				c.state = stateStart
 			}
 
 			// important to use Mutex because right fragment order
@@ -89,18 +87,16 @@ func (c *Consumer) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiv
 		}
 
 	case core.CodecH265:
-		c.wait = waitInit
-
 		handler.Handler = func(packet *rtp.Packet) {
 			if packet.Version != h264.RTPPacketVersionAVC {
 				return
 			}
 
-			if c.wait != waitNone {
+			if c.state != stateStart {
-				if c.wait == waitInit || !h265.IsKeyframe(packet.Payload) {
+				if c.state != stateInit || !h265.IsKeyframe(packet.Payload) {
 					return
 				}
-				c.wait = waitNone
+				c.state = stateStart
 			}
 
 			c.mu.Lock()
@@ -116,7 +112,7 @@ func (c *Consumer) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiv
 
 	default:
 		handler.Handler = func(packet *rtp.Packet) {
-			if c.wait != waitNone {
+			if c.state != stateStart {
 				return
 			}
 
@@ -182,9 +178,15 @@ func (c *Consumer) Init() ([]byte, error) {
 }
 
 func (c *Consumer) Start() {
-	if c.wait == waitInit {
+	for _, sender := range c.senders {
-		c.wait = waitKeyframe
+		switch sender.Codec.Name {
+		case core.CodecH264, core.CodecH265:
+			c.state = stateInit
+			return
+		}
 	}
+
+	c.state = stateStart
 }
 
 func (c *Consumer) MarshalJSON() ([]byte, error) {

pkg/mp4/consumer_test.go

@@ -0,0 +1,77 @@
+package mp4
+
+import (
+	"github.com/AlexxIT/go2rtc/pkg/core"
+	"github.com/AlexxIT/go2rtc/pkg/h264"
+	"github.com/pion/rtp"
+	"github.com/stretchr/testify/require"
+	"testing"
+	"time"
+)
+
+func TestStartH264(t *testing.T) {
+	codec := &core.Codec{Name: core.CodecH264}
+	track := core.NewReceiver(nil, codec)
+
+	packetKey := &rtp.Packet{
+		Header:  rtp.Header{Marker: true},
+		Payload: []byte{h264.NALUTypeIFrame, 0, 0},
+	}
+
+	packetNotKey := &rtp.Packet{
+		Header:  rtp.Header{Marker: true},
+		Payload: []byte{h264.NALUTypePFrame, 0, 0},
+	}
+
+	cons := &Consumer{}
+	err := cons.AddTrack(nil, nil, track)
+	require.Nil(t, err)
+
+	track.WriteRTP(packetKey)
+	time.Sleep(time.Millisecond)
+
+	_, err = cons.Init()
+	require.Nil(t, err)
+
+	cons.Start()
+
+	track.WriteRTP(packetNotKey)
+	time.Sleep(time.Millisecond)
+
+	require.Zero(t, cons.send)
+
+	track.WriteRTP(packetKey)
+	time.Sleep(time.Millisecond)
+
+	require.NotZero(t, cons.send)
+}
+
+func TestStartOPUS(t *testing.T) {
+	// Test for fix this issue
+	// https://github.com/AlexxIT/go2rtc/issues/404
+	codec := &core.Codec{Name: core.CodecOpus}
+	track := core.NewReceiver(nil, codec)
+
+	cons := &Consumer{}
+	err := cons.AddTrack(nil, nil, track)
+	require.Nil(t, err)
+
+	track.WriteRTP(&rtp.Packet{
+		Payload: []byte{0},
+	})
+	time.Sleep(time.Millisecond)
+
+	require.Zero(t, cons.send)
+
+	_, err = cons.Init()
+	require.Nil(t, err)
+
+	cons.Start()
+
+	track.WriteRTP(&rtp.Packet{
+		Payload: []byte{0},
+	})
+	time.Sleep(time.Millisecond)
+
+	require.NotZero(t, cons.send)
+}

pkg/mp4/helpers.go

@@ -49,7 +49,7 @@ func ParseQuery(query map[string][]string) []*core.Media {
 }
 
 const (
-	waitNone byte = iota
+	stateNone byte = iota
-	waitKeyframe
+	stateInit
-	waitInit
+	stateStart
 )