@ -1,10 +1,11 @@
package hls package hls
import ( import (
"bytes " "fmt "
"time" "time"
"github.com/aler9/gortsplib/v2/pkg/codecs/h264" "github.com/aler9/gortsplib/v2/pkg/codecs/h264"
"github.com/aler9/gortsplib/v2/pkg/codecs/h265"
"github.com/aler9/gortsplib/v2/pkg/format" "github.com/aler9/gortsplib/v2/pkg/format"
"github.com/aler9/rtsp-simple-server/internal/hls/fmp4" "github.com/aler9/rtsp-simple-server/internal/hls/fmp4"
@ -45,6 +46,21 @@ func findCompatiblePartDuration(
return i return i
} }
type dtsExtractor interface {
Extract ( [ ] [ ] byte , time . Duration ) ( time . Duration , error )
}
func allocateDTSExtractor ( track format . Format ) dtsExtractor {
switch track . ( type ) {
case * format . H264 :
return h264 . NewDTSExtractor ( )
case * format . H265 :
return h265 . NewDTSExtractor ( )
}
return nil
}
type augmentedVideoSample struct { type augmentedVideoSample struct {
fmp4 . PartSample fmp4 . PartSample
dts time . Duration dts time . Duration
@ -62,23 +78,23 @@ type muxerVariantFMP4Segmenter struct {
segmentDuration time . Duration segmentDuration time . Duration
partDuration time . Duration partDuration time . Duration
segmentMaxSize uint64 segmentMaxSize uint64
videoTrack * format . H264 videoTrack format . Format
audioTrack * format . MPEG4Audio audioTrack * format . MPEG4Audio
onSegmentFinalized func ( * muxerVariantFMP4Segment ) onSegmentFinalized func ( * muxerVariantFMP4Segment )
onPartFinalized func ( * muxerVariantFMP4Part ) onPartFinalized func ( * muxerVariantFMP4Part )
startDTS time . Duration startDTS time . Duration
videoFirstID RReceived bool videoFirstRandomAccess Received bool
videoDTSExtractor * h264 . DTS Extractor videoDTSExtractor dts Extractor
videoSPS [ ] byte lastVideoParams [ ] [ ] byte
currentSegment * muxerVariantFMP4Segment currentSegment * muxerVariantFMP4Segment
nextSegmentID uint64 nextSegmentID uint64
nextPartID uint64 nextPartID uint64
nextVideoSample * augmentedVideoSample nextVideoSample * augmentedVideoSample
nextAudioSample * augmentedAudioSample nextAudioSample * augmentedAudioSample
firstSegmentFinalized bool firstSegmentFinalized bool
sampleDurations map [ time . Duration ] struct { } sampleDurations map [ time . Duration ] struct { }
adjustedPartDuration time . Duration adjustedPartDuration time . Duration
} }
func newMuxerVariantFMP4Segmenter ( func newMuxerVariantFMP4Segmenter (
@ -87,7 +103,7 @@ func newMuxerVariantFMP4Segmenter(
segmentDuration time . Duration , segmentDuration time . Duration ,
partDuration time . Duration , partDuration time . Duration ,
segmentMaxSize uint64 , segmentMaxSize uint64 ,
videoTrack * format . H264 , videoTrack format . Format ,
audioTrack * format . MPEG4Audio , audioTrack * format . MPEG4Audio ,
onSegmentFinalized func ( * muxerVariantFMP4Segment ) , onSegmentFinalized func ( * muxerVariantFMP4Segment ) ,
onPartFinalized func ( * muxerVariantFMP4Part ) , onPartFinalized func ( * muxerVariantFMP4Part ) ,
@ -140,50 +156,65 @@ func (m *muxerVariantFMP4Segmenter) adjustPartDuration(du time.Duration) {
} }
} }
func ( m * muxerVariantFMP4Segmenter ) writeH264 ( ntp time . Time , pts time . Duration , nalus [ ] [ ] byte ) error { func ( m * muxerVariantFMP4Segmenter ) writeH26x ( ntp time . Time , pts time . Duration , au [ ] [ ] byte ) error {
idrPresent := false randomAccessPresent := false
nonIDRPresent := false
switch m . videoTrack . ( type ) {
case * format . H264 :
nonIDRPresent := false
for _ , nalu := range au {
typ := h264 . NALUType ( nalu [ 0 ] & 0x1F )
for _ , nalu := range nalus { switch typ {
typ := h264 . NALUType ( nalu [ 0 ] & 0x1F ) case h264 . NALUTypeIDR :
switch typ { randomAccessPresent = true
case h264 . NALUTypeIDR :
idrPresent = true
case h264 . NALUTypeNonIDR : case h264 . NALUTypeNonIDR :
nonIDRPresent = true nonIDRPresent = true
}
} }
}
if ! idrPresent && ! nonIDRPresent { if ! randomAccessPresent && ! nonIDRPresent {
return nil return nil
}
case * format . H265 :
for _ , nalu := range au {
typ := h265 . NALUType ( ( nalu [ 0 ] >> 1 ) & 0b111111 )
switch typ {
case h265 . NALUType_IDR_W_RADL , h265 . NALUType_IDR_N_LP , h265 . NALUType_CRA_NUT :
randomAccessPresent = true
}
}
} }
return m . writeH264Entry ( ntp , pts , nalus , idrPresent ) return m . writeH26x Entry ( ntp , pts , au , randomAccess Present)
} }
func ( m * muxerVariantFMP4Segmenter ) writeH264Entry ( func ( m * muxerVariantFMP4Segmenter ) writeH26x Entry (
ntp time . Time , ntp time . Time ,
pts time . Duration , pts time . Duration ,
nalus [ ] [ ] byte , au [ ] [ ] byte ,
idrPresent bool , randomAccess Presentbool ,
) error { ) error {
var dts time . Duration var dts time . Duration
if ! m . videoFirstID RReceived { if ! m . videoFirstRandomAccess Received {
// skip sample silently until we find one with an IDR
// skip sample silently until we find one with an IDR
if ! idr Present{ if ! randomAccess Present{
return nil return nil
} }
m . videoFirstID RReceived = true m . videoFirstRandomAccess Received = true
m . videoDTSExtractor = h264 . NewDTSExtractor ( ) m . videoDTSExtractor = allocateDTSExtractor ( m . videoTrack )
m . videoSPS = m . videoTrack . SafeSPS ( ) m . lastVideoParams = extractVideoParams ( m . videoTrack )
var err error var err error
dts , err = m . videoDTSExtractor . Extract ( n al us , pts ) dts , err = m . videoDTSExtractor . Extract ( au , pts )
if err != nil { if err != nil {
return err return fmt . Errorf ( "unable to extract DTS: %v" , err )
} }
m . startDTS = dts m . startDTS = dts
@ -191,16 +222,16 @@ func (m *muxerVariantFMP4Segmenter) writeH264Entry(
pts -= m . startDTS pts -= m . startDTS
} else { } else {
var err error var err error
dts , err = m . videoDTSExtractor . Extract ( n al us , pts ) dts , err = m . videoDTSExtractor . Extract ( au , pts )
if err != nil { if err != nil {
return err return fmt . Errorf ( "unable to extract DTS: %v" , err )
} }
dts -= m . startDTS dts -= m . startDTS
pts -= m . startDTS pts -= m . startDTS
} }
avcc , err := h264 . AVCCMarshal ( n al us ) avcc , err := h264 . AVCCMarshal ( au )
if err != nil { if err != nil {
return err return err
} }
@ -208,7 +239,7 @@ func (m *muxerVariantFMP4Segmenter) writeH264Entry(
sample := & augmentedVideoSample { sample := & augmentedVideoSample {
PartSample : fmp4 . PartSample { PartSample : fmp4 . PartSample {
PTSOffset : int32 ( durationGoToMp4 ( pts - dts , 90000 ) ) , PTSOffset : int32 ( durationGoToMp4 ( pts - dts , 90000 ) ) ,
IsNonSyncSample : ! idr Present, IsNonSyncSample : ! randomAccess Present,
Payload : avcc , Payload : avcc ,
} , } ,
dts : dts , dts : dts ,
@ -247,12 +278,12 @@ func (m *muxerVariantFMP4Segmenter) writeH264Entry(
} }
// switch segment
// switch segment
if idr Present{ if randomAccess Present{
sps := m . videoTrack . SafeSPS ( ) videoParams := extractVideoParams ( m . videoTrack )
s psChanged:= ! bytes . Equal ( m . videoSPS , sp s) param sChanged := ! videoParams Equal( m . lastVideoParams , videoParam s)
if ( m . nextVideoSample . dts - m . currentSegment . startDTS ) >= m . segmentDuration || if ( m . nextVideoSample . dts - m . currentSegment . startDTS ) >= m . segmentDuration ||
s psChanged{ param sChanged {
err := m . currentSegment . finalize ( m . nextVideoSample . dts ) err := m . currentSegment . finalize ( m . nextVideoSample . dts )
if err != nil { if err != nil {
return err return err
@ -273,10 +304,11 @@ func (m *muxerVariantFMP4Segmenter) writeH264Entry(
m . onPartFinalized , m . onPartFinalized ,
) )
// if SPS changed, reset adjusted part duration
if paramsChanged {
if spsChanged { m . lastVideoParams = videoParams
m . videoSPS = sps
m . firstSegmentFinalized = false m . firstSegmentFinalized = false
// reset adjusted part duration
m . sampleDurations = make ( map [ time . Duration ] struct { } ) m . sampleDurations = make ( map [ time . Duration ] struct { } )
} }
} }
@ -288,7 +320,7 @@ func (m *muxerVariantFMP4Segmenter) writeH264Entry(
func ( m * muxerVariantFMP4Segmenter ) writeAAC ( ntp time . Time , dts time . Duration , au [ ] byte ) error { func ( m * muxerVariantFMP4Segmenter ) writeAAC ( ntp time . Time , dts time . Duration , au [ ] byte ) error {
if m . videoTrack != nil { if m . videoTrack != nil {
// wait for the video track
// wait for the video track
if ! m . videoFirstID RReceived { if ! m . videoFirstRandomAccess Received {
return nil return nil
} }
Alessandro Ros
3 years ago
committed by
GitHub