mirror of
https://github.com/aler9/rtsp-simple-server
synced 2025-09-29 13:02:13 +08:00
61382e496b
When a path has a MPEG-TS, RTP or WebRTC source and the path configuration is reloaded, a routine was left open because the reload channel was not handled. This fixes the issue.
122 lines
2.7 KiB
Go
122 lines
2.7 KiB
Go
package hls
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio"
|
|
"github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/bluenviron/mediamtx/internal/conf"
|
|
"github.com/bluenviron/mediamtx/internal/defs"
|
|
"github.com/bluenviron/mediamtx/internal/test"
|
|
)
|
|
|
|
func TestSource(t *testing.T) {
|
|
track1 := &mpegts.Track{
|
|
Codec: &mpegts.CodecH264{},
|
|
}
|
|
|
|
track2 := &mpegts.Track{
|
|
Codec: &mpegts.CodecMPEG4Audio{
|
|
Config: mpeg4audio.AudioSpecificConfig{
|
|
Type: 2,
|
|
SampleRate: 44100,
|
|
ChannelCount: 2,
|
|
},
|
|
},
|
|
}
|
|
|
|
tracks := []*mpegts.Track{
|
|
track1,
|
|
track2,
|
|
}
|
|
|
|
s := &http.Server{
|
|
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
switch {
|
|
case r.Method == http.MethodGet && r.URL.Path == "/stream.m3u8":
|
|
w.Header().Set("Content-Type", `application/vnd.apple.mpegurl`)
|
|
w.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"))
|
|
|
|
case r.Method == http.MethodGet && r.URL.Path == "/segment1.ts":
|
|
w.Header().Set("Content-Type", `video/MP2T`)
|
|
|
|
w := &mpegts.Writer{W: w, Tracks: tracks}
|
|
err := w.Initialize()
|
|
require.NoError(t, err)
|
|
|
|
err = w.WriteMPEG4Audio(track2, 1*90000, [][]byte{{1, 2, 3, 4}})
|
|
require.NoError(t, err)
|
|
|
|
err = w.WriteH264(track1, 2*90000, 2*90000, [][]byte{
|
|
{7, 1, 2, 3}, // SPS
|
|
{8}, // PPS
|
|
})
|
|
require.NoError(t, err)
|
|
|
|
case r.Method == http.MethodGet && r.URL.Path == "/segment2.ts":
|
|
w.Header().Set("Content-Type", `video/MP2T`)
|
|
|
|
w := &mpegts.Writer{W: w, Tracks: tracks}
|
|
err := w.Initialize()
|
|
require.NoError(t, err)
|
|
|
|
err = w.WriteMPEG4Audio(track2, 3*90000, [][]byte{{1, 2, 3, 4}})
|
|
require.NoError(t, err)
|
|
}
|
|
}),
|
|
}
|
|
|
|
ln, err := net.Listen("tcp", "localhost:5780")
|
|
require.NoError(t, err)
|
|
|
|
go s.Serve(ln)
|
|
defer s.Shutdown(context.Background())
|
|
|
|
p := &test.StaticSourceParent{}
|
|
p.Initialize()
|
|
defer p.Close()
|
|
|
|
so := &Source{
|
|
Parent: p,
|
|
}
|
|
|
|
done := make(chan struct{})
|
|
defer func() { <-done }()
|
|
|
|
ctx, ctxCancel := context.WithCancel(context.Background())
|
|
defer ctxCancel()
|
|
|
|
reloadConf := make(chan *conf.Path)
|
|
|
|
go func() {
|
|
so.Run(defs.StaticSourceRunParams{ //nolint:errcheck
|
|
Context: ctx,
|
|
ResolvedSource: "http://localhost:5780/stream.m3u8",
|
|
Conf: &conf.Path{},
|
|
ReloadConf: reloadConf,
|
|
})
|
|
close(done)
|
|
}()
|
|
|
|
<-p.Unit
|
|
|
|
// the source must be listening on ReloadConf
|
|
reloadConf <- nil
|
|
}
|