RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2025-03-06 20:37:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

HLS: fix crash on armv7 (#440)

Browse Source
This commit is contained in:
aler9 2021-07-03 12:19:03 +02:00
parent a6d04aa1e9
commit b65ca7b5c6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/hlsconverter/converter.go
View File

@ -146,7 +146,7 @@ type Converter struct {
tsByName map[string]*tsFile
tsDeleteCount int
tsMutex sync.RWMutex
lastRequestTime int64
lastRequestTime *int64
// in
request chan Request
@ -176,9 +176,12 @@ func New(
parent: parent,
ctx: ctx,
ctxCancel: ctxCancel,
lastRequestTime: time.Now().Unix(),
tsByName: make(map[string]*tsFile),
request: make(chan Request),
lastRequestTime: func() *int64 {
v := time.Now().Unix()
return &v
}(),
tsByName: make(map[string]*tsFile),
request: make(chan Request),
}
c.log(logger.Info, "opened")
@ -534,7 +537,7 @@ func (c *Converter) runInner(innerCtx context.Context) error {
for {
select {
case <-closeCheckTicker.C:
t := time.Unix(atomic.LoadInt64(&c.lastRequestTime), 0)
t := time.Unix(atomic.LoadInt64(c.lastRequestTime), 0)
if time.Since(t) >= closeAfterInactivity {
c.ringBuffer.Close()
<-writerDone
@ -563,7 +566,7 @@ func (c *Converter) runRequestHandler(terminate chan struct{}, done chan struct{
case preq := <-c.request:
req := preq
atomic.StoreInt64(&c.lastRequestTime, time.Now().Unix())
atomic.StoreInt64(c.lastRequestTime, time.Now().Unix())
conf := c.path.Conf()