Browse Source

hls: remove useless check

pull/509/head
aler9 5 years ago
parent
commit
ba41af91b2
  1. 9
      internal/core/hls_remuxer.go
  2. 4
      internal/hls/muxer.go

9
internal/core/hls_remuxer.go

@ -435,15 +435,8 @@ func (r *hlsRemuxer) handleRequest(req hlsRemuxerRequest) { @@ -435,15 +435,8 @@ func (r *hlsRemuxer) handleRequest(req hlsRemuxerRequest) {
switch {
case req.File == "stream.m3u8":
r := r.muxer.Playlist()
if r == nil {
req.W.WriteHeader(http.StatusNotFound)
req.Res <- nil
return
}
req.W.Header().Set("Content-Type", `application/x-mpegURL`)
req.Res <- r
req.Res <- r.muxer.Playlist()
case strings.HasSuffix(req.File, ".ts"):
r := r.muxer.TSFile(req.File)

4
internal/hls/muxer.go

@ -213,10 +213,6 @@ func (m *Muxer) Playlist() io.Reader { @@ -213,10 +213,6 @@ func (m *Muxer) Playlist() io.Reader {
m.mutex.RLock()
defer m.mutex.RUnlock()
if len(m.tsQueue) == 0 {
return nil
}
cnt := "#EXTM3U\n"
cnt += "#EXT-X-VERSION:3\n"
cnt += "#EXT-X-ALLOW-CACHE:NO\n"

Loading…
Cancel
Save