RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2025-03-25 04:18:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

hls: cleanup

Browse Source
This commit is contained in:
aler9 2021-11-19 23:39:23 +01:00
parent 411a35e89f
commit e4a5732978
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/hls/muxer_ts_generator.go
View File

@ -26,7 +26,7 @@ type muxerTSGenerator struct {
aacConf *gortsplib.TrackConfigAAC
streamPlaylist *muxerStreamPlaylist
tm *astits.Muxer
tsmuxer *astits.Muxer
currentSegment *muxerTSSegment
videoDTSEst *h264.DTSEstimator
audioAUCount int
@ -53,29 +53,29 @@ func newMuxerTSGenerator(
aacConf: aacConf,
}
m.tm = astits.NewMuxer(context.Background(), m)
m.tsmuxer = astits.NewMuxer(context.Background(), m)
if videoTrack != nil {
m.tm.AddElementaryStream(astits.PMTElementaryStream{
m.tsmuxer.AddElementaryStream(astits.PMTElementaryStream{
ElementaryPID: 256,
StreamType: astits.StreamTypeH264Video,
})
}
if audioTrack != nil {
m.tm.AddElementaryStream(astits.PMTElementaryStream{
m.tsmuxer.AddElementaryStream(astits.PMTElementaryStream{
ElementaryPID: 257,
StreamType: astits.StreamTypeAACAudio,
})
}
if videoTrack != nil {
m.tm.SetPCRPID(256)
m.tsmuxer.SetPCRPID(256)
} else {
m.tm.SetPCRPID(257)
m.tsmuxer.SetPCRPID(257)
}
m.currentSegment = newMuxerTSSegment(m.videoTrack, m)
m.currentSegment = newMuxerTSSegment(m.videoTrack, m.tsmuxer)
return m
}
@ -105,7 +105,7 @@ func (m *muxerTSGenerator) writeH264(pts time.Duration, nalus [][]byte) error {
if idrPresent &&
m.currentSegment.duration() >= m.hlsSegmentDuration {
m.streamPlaylist.pushSegment(m.currentSegment)
m.currentSegment = newMuxerTSSegment(m.videoTrack, m)
m.currentSegment = newMuxerTSSegment(m.videoTrack, m.tsmuxer)
}
} else {
m.startPCR = time.Now()
@ -154,7 +154,7 @@ func (m *muxerTSGenerator) writeAAC(pts time.Duration, aus [][]byte) error {
m.currentSegment.duration() >= m.hlsSegmentDuration {
m.audioAUCount = 0
m.streamPlaylist.pushSegment(m.currentSegment)
m.currentSegment = newMuxerTSSegment(m.videoTrack, m)
m.currentSegment = newMuxerTSSegment(m.videoTrack, m.tsmuxer)
}
} else {
m.startPCR = time.Now()

10
internal/hls/muxer_ts_segment.go
View File

@ -12,7 +12,7 @@ import (
type muxerTSSegment struct {
videoTrack *gortsplib.Track
tsgen *muxerTSGenerator
tsmuxer *astits.Muxer
name string
buf bytes.Buffer
@ -24,11 +24,11 @@ type muxerTSSegment struct {
func newMuxerTSSegment(
videoTrack *gortsplib.Track,
tsgen *muxerTSGenerator,
tsmuxer *astits.Muxer,
) *muxerTSSegment {
t := &muxerTSSegment{
videoTrack: videoTrack,
tsgen: tsgen,
tsmuxer: tsmuxer,
name: strconv.FormatInt(time.Now().Unix(), 10),
}
@ -104,7 +104,7 @@ func (t *muxerTSSegment) writeH264(
oh.PTS = &astits.ClockReference{Base: int64(pts.Seconds() * 90000)}
}
_, err := t.tsgen.tm.WriteData(&astits.MuxerData{
_, err := t.tsmuxer.WriteData(&astits.MuxerData{
PID: 256,
AdaptationField: af,
PES: &astits.PESData{
@ -151,7 +151,7 @@ func (t *muxerTSSegment) writeAAC(
}
}
_, err := t.tsgen.tm.WriteData(&astits.MuxerData{
_, err := t.tsmuxer.WriteData(&astits.MuxerData{
PID: 257,
AdaptationField: af,
PES: &astits.PESData{