diff --git a/go.mod b/go.mod index 09fd28c6dc7..9455eb1aeef 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ go 1.19 require ( code.cloudfoundry.org/bytefmt v0.0.0 github.com/alecthomas/kong v0.7.1 - github.com/aler9/gortsplib/v2 v2.1.4 + github.com/aler9/gortsplib/v2 v2.1.7 github.com/asticode/go-astits v1.11.0 - github.com/bluenviron/gohlslib v0.0.0-20230312151707-933e641d84aa + github.com/bluenviron/gohlslib v0.0.0-20230314171751-fbd8c7f7e4c8 github.com/fsnotify/fsnotify v1.4.9 github.com/gin-gonic/gin v1.9.0 github.com/google/uuid v1.3.0 diff --git a/go.sum b/go.sum index c2baac0cd16..89bdb596838 100644 --- a/go.sum +++ b/go.sum @@ -4,16 +4,16 @@ github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2o github.com/alecthomas/kong v0.7.1 h1:azoTh0IOfwlAX3qN9sHWTxACE2oV8Bg2gAwBsMwDQY4= github.com/alecthomas/kong v0.7.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U= github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE= -github.com/aler9/gortsplib/v2 v2.1.4 h1:A4C4Qxz3aQibphXoKsifwKmKZRY7leaO3jHkA+SQ2kw= -github.com/aler9/gortsplib/v2 v2.1.4/go.mod h1:Eegw8PWa8hNYXiYMlbK3RX1gr7+r25MxniAPGA+kKUE= +github.com/aler9/gortsplib/v2 v2.1.7 h1:6KaPKSTjnbo3wzn+r4SdkR61Hmgit0OfrxtJ5yWP1hM= +github.com/aler9/gortsplib/v2 v2.1.7/go.mod h1:Eegw8PWa8hNYXiYMlbK3RX1gr7+r25MxniAPGA+kKUE= github.com/aler9/writerseeker v0.0.0-20220601075008-6f0e685b9c82 h1:9WgSzBLo3a9ToSVV7sRTBYZ1GGOZUpq4+5H3SN0UZq4= github.com/aler9/writerseeker v0.0.0-20220601075008-6f0e685b9c82/go.mod h1:qsMrZCbeBf/mCLOeF16KDkPu4gktn/pOWyaq1aYQE7U= github.com/asticode/go-astikit v0.30.0 h1:DkBkRQRIxYcknlaU7W7ksNfn4gMFsB0tqMJflxkRsZA= github.com/asticode/go-astikit v0.30.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0= github.com/asticode/go-astits v1.11.0 h1:GTHUXht0ZXAJXsVbsLIcyfHr1Bchi4QQwMARw2ZWAng= github.com/asticode/go-astits v1.11.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI= -github.com/bluenviron/gohlslib v0.0.0-20230312151707-933e641d84aa h1:zvGhswcO4E4B9k8+Jx7l+KERoKoQsxGFdMubsf8PVg4= -github.com/bluenviron/gohlslib v0.0.0-20230312151707-933e641d84aa/go.mod h1:SYixOK6Kux6cA9AGR1sg1GJdU2TmYiccVpPmS/Rxdt0= +github.com/bluenviron/gohlslib v0.0.0-20230314171751-fbd8c7f7e4c8 h1:OiisEsRRqbmRIjF20NYZfChLtEhTRkn8UGf1IxEWaxU= +github.com/bluenviron/gohlslib v0.0.0-20230314171751-fbd8c7f7e4c8/go.mod h1:9cqtfapvZBvgSgjjP8duIr4PbqnbVsyVSsmAl8wUIoU= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA= github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= diff --git a/internal/formatprocessor/h264.go b/internal/formatprocessor/h264.go index f557ddeece2..2a023868d1d 100644 --- a/internal/formatprocessor/h264.go +++ b/internal/formatprocessor/h264.go @@ -237,7 +237,7 @@ func (t *formatProcessorH264) Process(unit Unit, hasNonRTSPReaders bool) error { } // DecodeUntilMarker() is necessary, otherwise Encode() generates partial groups - au, PTS, err := t.decoder.DecodeUntilMarker(pkt) + au, pts, err := t.decoder.DecodeUntilMarker(pkt) if err != nil { if err == rtph264.ErrNonStartingPacketAndNoPrevious || err == rtph264.ErrMorePacketsNeeded { return nil @@ -246,7 +246,7 @@ func (t *formatProcessorH264) Process(unit Unit, hasNonRTSPReaders bool) error { } tunit.AU = au - tunit.PTS = PTS + tunit.PTS = pts tunit.AU = t.remuxAccessUnit(tunit.AU) } diff --git a/internal/formatprocessor/h265.go b/internal/formatprocessor/h265.go index 6fb804b29a5..1df453abbf3 100644 --- a/internal/formatprocessor/h265.go +++ b/internal/formatprocessor/h265.go @@ -258,7 +258,7 @@ func (t *formatProcessorH265) Process(unit Unit, hasNonRTSPReaders bool) error { } // DecodeUntilMarker() is necessary, otherwise Encode() generates partial groups - au, PTS, err := t.decoder.DecodeUntilMarker(pkt) + au, pts, err := t.decoder.DecodeUntilMarker(pkt) if err != nil { if err == rtph265.ErrNonStartingPacketAndNoPrevious || err == rtph265.ErrMorePacketsNeeded { return nil @@ -267,7 +267,7 @@ func (t *formatProcessorH265) Process(unit Unit, hasNonRTSPReaders bool) error { } tunit.AU = au - tunit.PTS = PTS + tunit.PTS = pts tunit.AU = t.remuxAccessUnit(tunit.AU) } diff --git a/internal/formatprocessor/mpeg4audio.go b/internal/formatprocessor/mpeg4audio.go index 6fd76e836ec..c5488a97704 100644 --- a/internal/formatprocessor/mpeg4audio.go +++ b/internal/formatprocessor/mpeg4audio.go @@ -69,7 +69,7 @@ func (t *formatProcessorMPEG4Audio) Process(unit Unit, hasNonRTSPReaders bool) e t.decoder = t.format.CreateDecoder() } - aus, PTS, err := t.decoder.Decode(pkt) + aus, pts, err := t.decoder.Decode(pkt) if err != nil { if err == rtpmpeg4audio.ErrMorePacketsNeeded { return nil @@ -78,7 +78,7 @@ func (t *formatProcessorMPEG4Audio) Process(unit Unit, hasNonRTSPReaders bool) e } tunit.AUs = aus - tunit.PTS = PTS + tunit.PTS = pts } // route packet as is diff --git a/internal/formatprocessor/opus.go b/internal/formatprocessor/opus.go index 95c1c70760a..babc25f56b3 100644 --- a/internal/formatprocessor/opus.go +++ b/internal/formatprocessor/opus.go @@ -69,13 +69,13 @@ func (t *formatProcessorOpus) Process(unit Unit, hasNonRTSPReaders bool) error { t.decoder = t.format.CreateDecoder() } - frame, PTS, err := t.decoder.Decode(pkt) + frame, pts, err := t.decoder.Decode(pkt) if err != nil { return err } tunit.Frame = frame - tunit.PTS = PTS + tunit.PTS = pts } // route packet as is diff --git a/internal/formatprocessor/vp8.go b/internal/formatprocessor/vp8.go index c860f3f940a..5e0b0bd2c92 100644 --- a/internal/formatprocessor/vp8.go +++ b/internal/formatprocessor/vp8.go @@ -69,7 +69,7 @@ func (t *formatProcessorVP8) Process(unit Unit, hasNonRTSPReaders bool) error { t.decoder = t.format.CreateDecoder() } - frame, PTS, err := t.decoder.Decode(pkt) + frame, pts, err := t.decoder.Decode(pkt) if err != nil { if err == rtpvp8.ErrMorePacketsNeeded { return nil @@ -78,7 +78,7 @@ func (t *formatProcessorVP8) Process(unit Unit, hasNonRTSPReaders bool) error { } tunit.Frame = frame - tunit.PTS = PTS + tunit.PTS = pts } // route packet as is diff --git a/internal/formatprocessor/vp9.go b/internal/formatprocessor/vp9.go index 711b7365168..58ccfd487a0 100644 --- a/internal/formatprocessor/vp9.go +++ b/internal/formatprocessor/vp9.go @@ -69,7 +69,7 @@ func (t *formatProcessorVP9) Process(unit Unit, hasNonRTSPReaders bool) error { t.decoder = t.format.CreateDecoder() } - frame, PTS, err := t.decoder.Decode(pkt) + frame, pts, err := t.decoder.Decode(pkt) if err != nil { if err == rtpvp9.ErrMorePacketsNeeded { return nil @@ -78,7 +78,7 @@ func (t *formatProcessorVP9) Process(unit Unit, hasNonRTSPReaders bool) error { } tunit.Frame = frame - tunit.PTS = PTS + tunit.PTS = pts } // route packet as is