RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2024-12-14 18:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

HLS client: support dynamic H264 SPS/PPS

Browse Source
This commit is contained in:
aler9 2022-03-06 16:08:59 +01:00 committed by Alessandro Ros
parent 4d6f8b9b9b
commit 57cb2e99d1
1 changed files with 13 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
internal/hls/client_video_processor.go
View File

@ -23,11 +23,8 @@ type clientVideoProcessor struct {
onData func(time.Duration, [][]byte)
logger ClientLogger
trackInitialized bool
queue chan clientVideoProcessorData
sps []byte
pps []byte
clockStartRTC time.Time
queue chan clientVideoProcessorData
clockStartRTC time.Time
}
func newClientVideoProcessor(
@ -48,6 +45,16 @@ func newClientVideoProcessor(
}
func (p *clientVideoProcessor) run() error {
track, err := gortsplib.NewTrackH264(96, nil, nil, nil)
if err != nil {
return err
}
err = p.onTrack(track)
if err != nil {
return err
}
for {
select {
case item := <-p.queue:
@ -87,40 +94,7 @@ func (p *clientVideoProcessor) doProcess(
for _, nalu := range nalus {
typ := h264.NALUType(nalu[0] & 0x1F)
switch typ {
case h264.NALUTypeSPS:
if p.sps == nil {
p.sps = append([]byte(nil), nalu...)
if !p.trackInitialized && p.pps != nil {
p.trackInitialized = true
err := p.initializeTrack()
if err != nil {
return err
}
}
}
// remove since it's not needed
continue
case h264.NALUTypePPS:
if p.pps == nil {
p.pps = append([]byte(nil), nalu...)
if !p.trackInitialized && p.sps != nil {
p.trackInitialized = true
err := p.initializeTrack()
if err != nil {
return err
}
}
}
// remove since it's not needed
continue
case h264.NALUTypeAccessUnitDelimiter:
if typ == h264.NALUTypeAccessUnitDelimiter {
// remove since it's not needed
continue
}
@ -132,10 +106,6 @@ func (p *clientVideoProcessor) doProcess(
return nil
}
if !p.trackInitialized {
return nil
}
p.onData(pts, outNALUs)
return nil
}
@ -150,12 +120,3 @@ func (p *clientVideoProcessor) process(
case <-p.ctx.Done():
}
}
func (p *clientVideoProcessor) initializeTrack() error {
track, err := gortsplib.NewTrackH264(96, p.sps, p.pps, nil)
if err != nil {
return err
}
return p.onTrack(track)
}