playback: fix error 404 when seeking before start of segment (#4276) (#4533)

Fixes #4276
Replaces #4533

Author: aler9

internal/playback/muxer_fmp4.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer"
+	"github.com/bluenviron/mediamtx/internal/recordstore"
 )
 
 const (
@@ -73,7 +74,7 @@ func (w *muxerFMP4) writeSample(
 		if w.curTrack.firstDTS < 0 {
 			w.curTrack.firstDTS = dts
 
-			// if frame is a IDR, remove previous GOP
+			// if sample is a IDR, remove previous GOP
 			if !isNonSyncSample {
 				w.curTrack.samples = nil
 			}
@@ -101,14 +102,14 @@ func (w *muxerFMP4) writeSample(
 			}
 		}
 	} else {
-		// store GOP of the first frame, and set PTSOffset = 0 and Duration = 0 in each sample
-		if !isNonSyncSample { // if frame is a IDR, reset GOP
+		if !isNonSyncSample { // sample is IDR
+			// reset GOP
 			w.curTrack.samples = []*fmp4.PartSample{{
 				IsNonSyncSample: isNonSyncSample,
 				Payload:         pl,
 			}}
-		} else {
-			// append frame to current GOP
+		} else { // sample is not IDR
+			// append sample to current GOP, with PTSOffset = 0 and Duration = 0
 			w.curTrack.samples = append(w.curTrack.samples, &fmp4.PartSample{
 				IsNonSyncSample: isNonSyncSample,
 				Payload:         pl,
@@ -156,26 +157,20 @@ func (w *muxerFMP4) innerFlush(final bool) error {
 		}
 	}
 
-	if part.Tracks != nil {
-		part.SequenceNumber = w.nextSequenceNumber
-		w.nextSequenceNumber++
-
+	// no samples to write
+	if part.Tracks == nil {
+		// if no samples has been written before, return an error
 		if w.init != nil {
-			err := w.init.Marshal(&w.outBuf)
-			if err != nil {
-				return err
-			}
-
-			_, err = w.w.Write(w.outBuf.Bytes())
-			if err != nil {
-				return err
-			}
-
-			w.init = nil
-			w.outBuf.Reset()
+			return recordstore.ErrNoSegmentsFound
 		}
+		return nil
+	}
 
-		err := part.Marshal(&w.outBuf)
+	part.SequenceNumber = w.nextSequenceNumber
+	w.nextSequenceNumber++
+
+	if w.init != nil {
+		err := w.init.Marshal(&w.outBuf)
 		if err != nil {
 			return err
 		}
@@ -185,9 +180,22 @@ func (w *muxerFMP4) innerFlush(final bool) error {
 			return err
 		}
 
+		w.init = nil
 		w.outBuf.Reset()
 	}
 
+	err := part.Marshal(&w.outBuf)
+	if err != nil {
+		return err
+	}
+
+	_, err = w.w.Write(w.outBuf.Bytes())
+	if err != nil {
+		return err
+	}
+
+	w.outBuf.Reset()
+
 	return nil
 }
 

internal/playback/muxer_mp4.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4"
 	"github.com/bluenviron/mediacommon/v2/pkg/formats/pmp4"
+	"github.com/bluenviron/mediamtx/internal/recordstore"
 )
 
 type muxerMP4Track struct {
@@ -24,8 +25,9 @@ func findTrackMP4(tracks []*muxerMP4Track, id int) *muxerMP4Track {
 type muxerMP4 struct {
 	w io.Writer
 
-	tracks   []*muxerMP4Track
-	curTrack *muxerMP4Track
+	tracks     []*muxerMP4Track
+	curTrack   *muxerMP4Track
+	hasContent bool
 }
 
 func (w *muxerMP4) writeInit(init *fmp4.Init) {
@@ -53,7 +55,7 @@ func (w *muxerMP4) writeSample(
 	payloadSize uint32,
 	getPayload func() ([]byte, error),
 ) error {
-	// remove GOPs before the GOP of the first frame
+	// remove GOPs before the GOP of the first sample
 	if (dts < 0 || (dts >= 0 && w.curTrack.lastDTS < 0)) && !isNonSyncSample {
 		w.curTrack.Samples = nil
 	}
@@ -73,6 +75,8 @@ func (w *muxerMP4) writeSample(
 		ptsOffset = 0
 	}
 
+	w.hasContent = w.hasContent || dts >= 0
+
 	w.curTrack.Samples = append(w.curTrack.Samples, &pmp4.Sample{
 		PTSOffset:       ptsOffset,
 		IsNonSyncSample: isNonSyncSample,
@@ -93,6 +97,10 @@ func (w *muxerMP4) writeFinalDTS(dts int64) {
 }
 
 func (w *muxerMP4) flush() error {
+	if !w.hasContent {
+		return recordstore.ErrNoSegmentsFound
+	}
+
 	h := pmp4.Presentation{
 		Tracks: make([]*pmp4.Track, len(w.tracks)),
 	}