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

hls: do not send DTS if PTS = DTS

Browse Source
This commit is contained in:
aler9 2021-08-20 13:07:35 +02:00
parent 6e5564c0a2
commit b3c13fcf9a
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
internal/hls/tsfile.go
View File

@ -119,12 +119,15 @@ func (t *tsFile) writeH264(
filteredNALUs = append(filteredNALUs, nalu)
}
enc, err := h264.EncodeAnnexB(filteredNALUs)
if err != nil {
return err
}
var af *astits.PacketAdaptationField
if isIDR {
if af == nil {
af = &astits.PacketAdaptationField{}
}
af = &astits.PacketAdaptationField{}
af.RandomAccessIndicator = true
// send PCR with every IDR
@ -133,9 +136,17 @@ func (t *tsFile) writeH264(
af.PCR = &astits.ClockReference{Base: int64(pcr.Seconds() * 90000)}
}
enc, err := h264.EncodeAnnexB(filteredNALUs)
if err != nil {
return err
oh := &astits.PESOptionalHeader{
MarkerBits: 2,
}
if dts == pts {
oh.PTSDTSIndicator = astits.PTSDTSIndicatorOnlyPTS
oh.PTS = &astits.ClockReference{Base: int64(pts.Seconds() * 90000)}
} else {
oh.PTSDTSIndicator = astits.PTSDTSIndicatorBothPresent
oh.DTS = &astits.ClockReference{Base: int64(dts.Seconds() * 90000)}
oh.PTS = &astits.ClockReference{Base: int64(pts.Seconds() * 90000)}
}
_, err = t.mux.WriteData(&astits.MuxerData{
@ -143,13 +154,8 @@ func (t *tsFile) writeH264(
AdaptationField: af,
PES: &astits.PESData{
Header: &astits.PESHeader{
OptionalHeader: &astits.PESOptionalHeader{
MarkerBits: 2,
PTSDTSIndicator: astits.PTSDTSIndicatorBothPresent,
DTS: &astits.ClockReference{Base: int64(dts.Seconds() * 90000)},
PTS: &astits.ClockReference{Base: int64(pts.Seconds() * 90000)},
},
StreamID: 224, // = video
OptionalHeader: oh,
StreamID: 224, // = video
},
Data: enc,
},
@ -188,8 +194,8 @@ func (t *tsFile) writeAAC(sampleRate int, channelCount int, pts time.Duration, a
RandomAccessIndicator: true,
}
// if audio is the only track, send PCR with every AU
if t.videoTrack == nil {
// if audio is the only track, send PCR with every AU
af.HasPCR = true
pcr := time.Since(t.startPCR)
af.PCR = &astits.ClockReference{Base: int64(pcr.Seconds() * 90000)}