update gohlslib (#2862)

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/abema/go-mp4 v1.1.1
 	github.com/alecthomas/kong v0.8.1
 	github.com/aler9/writerseeker v1.1.0
-	github.com/bluenviron/gohlslib v1.1.0
+	github.com/bluenviron/gohlslib v1.2.0
 	github.com/bluenviron/gortsplib/v4 v4.6.2
 	github.com/bluenviron/mediacommon v1.6.1-0.20231228213201-7bb211dba7e1
 	github.com/datarhei/gosrt v0.5.5

go.sum

@@ -20,8 +20,8 @@ github.com/asticode/go-astits v1.13.0 h1:XOgkaadfZODnyZRR5Y0/DWkA9vrkLLPLeeOvDwf
 github.com/asticode/go-astits v1.13.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
 github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c h1:8XZeJrs4+ZYhJeJ2aZxADI2tGADS15AzIF8MQ8XAhT4=
 github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c/go.mod h1:x1vxHcL/9AVzuk5HOloOEPrtJY0MaalYr78afXZ+pWI=
-github.com/bluenviron/gohlslib v1.1.0 h1:NL8CYg1BqHpy9tUugd/SbXH5p5vEi7Im/zaw0dppJ1c=
+github.com/bluenviron/gohlslib v1.2.0 h1:Hrx2/n/AcmKKIV+MjZLKs5kmW+O7xCdUSPJQoS39JKw=
-github.com/bluenviron/gohlslib v1.1.0/go.mod h1:kG/Sjebsxnf5asMGaGcQ0aSvtFGNChJPgctds2wDHOI=
+github.com/bluenviron/gohlslib v1.2.0/go.mod h1:kG/Sjebsxnf5asMGaGcQ0aSvtFGNChJPgctds2wDHOI=
 github.com/bluenviron/gortsplib/v4 v4.6.2 h1:CGIsxpnUFvSlIxnSFS0oFSSfwsHMmBCmYcrGAtIcwXc=
 github.com/bluenviron/gortsplib/v4 v4.6.2/go.mod h1:dN1YjyPNMfy/NwC17Ga6MiIMiUoQfg5GL7LGsVHa0Jo=
 github.com/bluenviron/mediacommon v1.6.1-0.20231228213201-7bb211dba7e1 h1:f8XDAHvgPbT+n5qf73REdUo9kLmGpP4HNgphKI/8fGE=

internal/staticsources/hls/source.go

@@ -60,6 +60,9 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
 		OnDownloadSegment: func(u string) {
 			s.Log(logger.Debug, "downloading segment %v", u)
 		},
+		OnDownloadPart: func(u string) {
+			s.Log(logger.Debug, "downloading part %v", u)
+		},
 		OnDecodeError: func(err error) {
 			decodeErrLogger.Log(logger.Warn, err.Error())
 		},

internal/staticsources/hls/source_test.go

@@ -1,9 +1,7 @@
 package hls
 
 import (
-	"bytes"
 	"context"
-	"io"
 	"net"
 	"net/http"
 	"testing"
@@ -18,11 +16,12 @@ import (
 	"github.com/bluenviron/mediamtx/internal/staticsources/tester"
 )
 
-var track1 = &mpegts.Track{
+func TestSource(t *testing.T) {
+	track1 := &mpegts.Track{
 		Codec: &mpegts.CodecH264{},
-}
+	}
 
-var track2 = &mpegts.Track{
+	track2 := &mpegts.Track{
 		Codec: &mpegts.CodecMPEG4Audio{
 			Config: mpeg4audio.Config{
 				Type:         2,
@@ -30,76 +29,62 @@ var track2 = &mpegts.Track{
 				ChannelCount: 2,
 			},
 		},
-}
-
-type testHLSServer struct {
-	s *http.Server
-}
-
-func newTestHLSServer() (*testHLSServer, error) {
-	ln, err := net.Listen("tcp", "localhost:5780")
-	if err != nil {
-		return nil, err
 	}
 
-	ts := &testHLSServer{}
+	tracks := []*mpegts.Track{
+		track1,
+		track2,
+	}
 
 	gin.SetMode(gin.ReleaseMode)
 	router := gin.New()
-	router.GET("/stream.m3u8", ts.onPlaylist)
-	router.GET("/segment1.ts", ts.onSegment1)
-	router.GET("/segment2.ts", ts.onSegment2)
-
-	ts.s = &http.Server{Handler: router}
-	go ts.s.Serve(ln)
-
-	return ts, nil
-}
-
-func (ts *testHLSServer) close() {
-	ts.s.Shutdown(context.Background())
-}
-
-func (ts *testHLSServer) onPlaylist(ctx *gin.Context) {
-	cnt := `#EXTM3U
-#EXT-X-VERSION:3
-#EXT-X-ALLOW-CACHE:NO
-#EXT-X-TARGETDURATION:2
-#EXT-X-MEDIA-SEQUENCE:0
-#EXTINF:2,
-segment1.ts
-#EXTINF:2,
-segment2.ts
-#EXT-X-ENDLIST
-`
 
+	router.GET("/stream.m3u8", func(ctx *gin.Context) {
 		ctx.Writer.Header().Set("Content-Type", `application/vnd.apple.mpegurl`)
-	io.Copy(ctx.Writer, bytes.NewReader([]byte(cnt)))
+		ctx.Writer.Write([]byte("#EXTM3U\n" +
-}
+			"#EXT-X-VERSION:3\n" +
+			"#EXT-X-ALLOW-CACHE:NO\n" +
+			"#EXT-X-TARGETDURATION:2\n" +
+			"#EXT-X-MEDIA-SEQUENCE:0\n" +
+			"#EXTINF:2,\n" +
+			"segment1.ts\n" +
+			"#EXTINF:2,\n" +
+			"segment2.ts\n" +
+			"#EXTINF:2,\n" +
+			"segment2.ts\n" +
+			"#EXT-X-ENDLIST\n"))
+	})
 
-func (ts *testHLSServer) onSegment1(ctx *gin.Context) {
+	router.GET("/segment1.ts", func(ctx *gin.Context) {
 		ctx.Writer.Header().Set("Content-Type", `video/MP2T`)
 
-	w := mpegts.NewWriter(ctx.Writer, []*mpegts.Track{track1, track2})
+		w := mpegts.NewWriter(ctx.Writer, tracks)
 
-	w.WriteMPEG4Audio(track2, 1*90000, [][]byte{{1, 2, 3, 4}}) //nolint:errcheck
+		err := w.WriteMPEG4Audio(track2, 1*90000, [][]byte{{1, 2, 3, 4}})
-}
+		require.NoError(t, err)
+
+		err = w.WriteH26x(track1, 2*90000, 2*90000, true, [][]byte{
+			{7, 1, 2, 3}, // SPS
+			{8},          // PPS
+		})
+		require.NoError(t, err)
+	})
 
-func (ts *testHLSServer) onSegment2(ctx *gin.Context) {
+	router.GET("/segment2.ts", func(ctx *gin.Context) {
 		ctx.Writer.Header().Set("Content-Type", `video/MP2T`)
 
-	w := mpegts.NewWriter(ctx.Writer, []*mpegts.Track{track1, track2})
+		w := mpegts.NewWriter(ctx.Writer, tracks)
 
-	w.WriteH26x(track1, 2*90000, 2*90000, true, [][]byte{ //nolint:errcheck
+		err := w.WriteMPEG4Audio(track2, 3*90000, [][]byte{{1, 2, 3, 4}})
-		{7, 1, 2, 3}, // SPS
+		require.NoError(t, err)
-		{8},          // PPS
 	})
-}
 
-func TestSource(t *testing.T) {
+	ln, err := net.Listen("tcp", "localhost:5780")
-	ts, err := newTestHLSServer()
 	require.NoError(t, err)
-	defer ts.close()
+
+	s := &http.Server{Handler: router}
+	go s.Serve(ln)
+	defer s.Shutdown(context.Background())
 
 	te := tester.New(
 		func(p defs.StaticSourceParent) defs.StaticSource {