External/mediamtx
1
0
Fork 1
mirror of https://github.com/bluenviron/mediamtx.git synced 2026-01-23 11:59:51 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

hls: fix race condition when getting absolute time (#4375)

Browse source
This commit is contained in:
Alessandro Ros 2025-03-29 17:10:31 +01:00 • committed by GitHub
parent 6250d6c485
commit ee8a47844a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
internal/protocols/hls/to_stream.go
View file

@ -1,6 +1,7 @@
package hls
import (
"sync"
"time"
"github.com/bluenviron/gohlslib/v2"
@ -33,18 +34,22 @@ func ToStream(
tracks []*gohlslib.Track,
stream **stream.Stream,
) ([]*description.Media, error) {
var state ntpState
var ntpStat ntpState
var ntpStatMutex sync.Mutex
handleNTP := func(track *gohlslib.Track) time.Time {
switch state {
ntpStatMutex.Lock()
defer ntpStatMutex.Unlock()
switch ntpStat {
case ntpStateInitial:
ntp, avail := c.AbsoluteTime(track)
if !avail {
state = ntpStateUnavailable
ntpStat = ntpStateUnavailable
return time.Now()
}
state = ntpStateAvailable
ntpStat = ntpStateAvailable
return ntp
case ntpStateAvailable:
@ -59,7 +64,7 @@ func ToStream(
_, avail := c.AbsoluteTime(track)
if avail {
(*stream).Parent.Log(logger.Warn, "absolute timestamp appeared after stream started, we are not using it")
state = ntpStateDegraded
ntpStat = ntpStateDegraded
}
return time.Now()
@ -88,7 +93,7 @@ func ToStream(
(*stream).WriteUnit(medi, medi.Formats[0], &unit.AV1{
Base: unit.Base{
NTP: handleNTP(track),
PTS: pts, // no conversion is needed since clock rate is 90khz in both MPEG-TS and RTSP
PTS: pts, // no conversion is needed since clock rate is 90khz in both HLS and RTSP
},
TU: tu,
})
@ -106,7 +111,7 @@ func ToStream(
(*stream).WriteUnit(medi, medi.Formats[0], &unit.VP9{
Base: unit.Base{
NTP: handleNTP(track),
PTS: pts, // no conversion is needed since clock rate is 90khz in both MPEG-TS and RTSP
PTS: pts, // no conversion is needed since clock rate is 90khz in both HLS and RTSP
},
Frame: frame,
})
@ -127,7 +132,7 @@ func ToStream(
(*stream).WriteUnit(medi, medi.Formats[0], &unit.H265{
Base: unit.Base{
NTP: handleNTP(track),
PTS: pts, // no conversion is needed since clock rate is 90khz in both MPEG-TS and RTSP
PTS: pts, // no conversion is needed since clock rate is 90khz in both HLS and RTSP
},
AU: au,
})
@ -148,7 +153,7 @@ func ToStream(
(*stream).WriteUnit(medi, medi.Formats[0], &unit.H264{
Base: unit.Base{
NTP: handleNTP(track),
PTS: pts, // no conversion is needed since clock rate is 90khz in both MPEG-TS and RTSP
PTS: pts, // no conversion is needed since clock rate is 90khz in both HLS and RTSP
},
AU: au,
})
@ -167,7 +172,7 @@ func ToStream(
(*stream).WriteUnit(medi, medi.Formats[0], &unit.Opus{
Base: unit.Base{
NTP: handleNTP(track),
PTS: multiplyAndDivide(pts, int64(medi.Formats[0].ClockRate()), int64(clockRate)),
PTS: pts, // // no conversion is needed since clock rate is 48khz in both HLS and RTSP
},
Packets: packets,
})