muxer: serve different tracks in different streams (#180)

bluenviron · Oct 2, 2024 · 56d25b4 · 56d25b4
1 parent a94133b
commit 56d25b4
Show file tree

Hide file tree

Showing 6 changed files with 528 additions and 412 deletions.
diff --git a/muxer.go b/muxer.go
@@ -228,7 +228,7 @@ func (m *Muxer) Start() error {
 	}
 
 	switch {
-	case true || m.Variant == MuxerVariantMPEGTS:
+	case m.Variant == MuxerVariantMPEGTS:
 		stream := &muxerStream{
 			muxer:  m,
 			tracks: m.mtracks,

diff --git a/muxer_part.go b/muxer_part.go
@@ -18,7 +18,7 @@ type muxerPart struct {
 
 	path          string
 	isIndependent bool
-	finalDuration time.Duration
+	endDTS        time.Duration
 }
 
 func (p *muxerPart) initialize() {
@@ -29,8 +29,8 @@ func (p *muxerPart) reader() (io.ReadCloser, error) {
 	return p.storage.Reader()
 }
 
-func (p *muxerPart) computeDuration(endDTS time.Duration) time.Duration {
-	return endDTS - p.startDTS
+func (p *muxerPart) getDuration() time.Duration {
+	return p.endDTS - p.startDTS
 }
 
 func (p *muxerPart) finalize(endDTS time.Duration) error {
@@ -56,7 +56,7 @@ func (p *muxerPart) finalize(endDTS time.Duration) error {
 		return err
 	}
 
-	p.finalDuration = p.computeDuration(endDTS)
+	p.endDTS = endDTS
 
 	return nil
 }
@@ -67,7 +67,7 @@ func (p *muxerPart) writeSample(track *muxerTrack, sample *fmp4AugmentedSample)
 		track.fmp4StartDTS = sample.dts
 	}
 
-	if track.isLeading && !sample.IsNonSyncSample {
+	if (track.isLeading || len(track.stream.tracks) == 1) && !sample.IsNonSyncSample {
 		p.isIndependent = true
 	}
 

diff --git a/muxer_segmenter.go b/muxer_segmenter.go
@@ -559,7 +559,7 @@ func (s *muxerSegmenter) fmp4WriteSample(
 
 			// switch part
 		} else if (s.muxer.Variant == MuxerVariantLowLatency) &&
-			track.stream.nextPart.computeDuration(track.fmp4NextSample.dts) >= s.fmp4AdjustedPartDuration {
+			(track.fmp4NextSample.dts-track.stream.nextPart.startDTS) >= s.fmp4AdjustedPartDuration {
 			err := s.muxer.rotateParts(track.fmp4NextSample.dts)
 			if err != nil {
 				return err

diff --git a/muxer_server.go b/muxer_server.go
@@ -48,15 +48,15 @@ func partTargetDuration(
 			}
 
 			for _, part := range seg.parts {
-				if part.finalDuration > ret {
-					ret = part.finalDuration
+				if part.getDuration() > ret {
+					ret = part.getDuration()
 				}
 			}
 		}
 
 		for _, part := range stream.nextSegment.(*muxerSegmentFMP4).parts {
-			if part.finalDuration > ret {
-				ret = part.finalDuration
+			if part.getDuration() > ret {
+				ret = part.getDuration()
 			}
 		}
 	}

diff --git a/muxer_stream.go b/muxer_stream.go
@@ -423,7 +423,7 @@ func (s *muxerStream) generateMediaPlaylistFMP4(
 					}
 
 					plse.Parts = append(plse.Parts, &playlist.MediaPart{
-						Duration:    part.finalDuration,
+						Duration:    part.getDuration(),
 						URI:         u,
 						Independent: part.isIndependent,
 					})
@@ -449,7 +449,7 @@ func (s *muxerStream) generateMediaPlaylistFMP4(
 			}
 
 			pl.Parts = append(pl.Parts, &playlist.MediaPart{
-				Duration:    part.finalDuration,
+				Duration:    part.getDuration(),
 				URI:         u,
 				Independent: part.isIndependent,
 			})