pimhwang
/
mediamtx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update gortsplib

pull/1055/head
aler9 3 years ago
parent
e146df9ed7
commit
5ba46e6c8f
6 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      go.mod
  2. 4
      go.sum
  3. 8
      internal/core/hls_muxer.go
  4. 6
      internal/core/hls_source.go
  5. 12
      internal/core/rtmp_conn.go
  6. 6
      internal/core/rtmp_source.go

2
go.mod
Unescape View File

@ -5,7 +5,7 @@ go 1.17 @@ -5,7 +5,7 @@ go 1.17
require (
code.cloudfoundry.org/bytefmt v0.0.0-20211005130812-5bb3c17173e5
github.com/abema/go-mp4 v0.7.2
github.com/aler9/gortsplib v0.0.0-20220807120100-4b19822d5158
github.com/aler9/gortsplib v0.0.0-20220814104740-40c1ff8dfe6f
github.com/asticode/go-astits v1.10.1-0.20220319093903-4abe66a9b757
github.com/fsnotify/fsnotify v1.4.9
github.com/gin-gonic/gin v1.8.1

4
go.sum
Unescape View File

@ -6,8 +6,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafo @@ -6,8 +6,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafo
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2cI+DC1Mbh0TJxzA3RcLoMsFw+aXw7E=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/aler9/gortsplib v0.0.0-20220807120100-4b19822d5158 h1:i2J67KclIgKf9N9akXnlm3BFrlbiboL3HODIYCph77M=
github.com/aler9/gortsplib v0.0.0-20220807120100-4b19822d5158/go.mod h1:WI3nMhY2mM6nfoeW9uyk7TyG5Qr6YnYxmFoCply0sbo=
github.com/aler9/gortsplib v0.0.0-20220814104740-40c1ff8dfe6f h1:eZTzrvym2DNQY9u8/5VCaF99zHMrxJov3QNQytpQtNk=
github.com/aler9/gortsplib v0.0.0-20220814104740-40c1ff8dfe6f/go.mod h1:WI3nMhY2mM6nfoeW9uyk7TyG5Qr6YnYxmFoCply0sbo=
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.20.0 h1:+7N+J4E4lWx2QOkRdOf6DafWJMv6O4RRfgClwQokrH8=

8
internal/core/hls_muxer.go
Unescape View File

@ -13,7 +13,7 @@ import ( @@ -13,7 +13,7 @@ import (
"github.com/aler9/gortsplib"
"github.com/aler9/gortsplib/pkg/ringbuffer"
"github.com/aler9/gortsplib/pkg/rtpaac"
"github.com/aler9/gortsplib/pkg/rtpmpeg4audio"
"github.com/gin-gonic/gin"
"github.com/aler9/rtsp-simple-server/internal/conf"
@ -294,7 +294,7 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{}) @@ -294,7 +294,7 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{})
videoTrackID := -1
var audioTrack *gortsplib.TrackMPEG4Audio
audioTrackID := -1
var aacDecoder *rtpaac.Decoder
var aacDecoder *rtpmpeg4audio.Decoder
for i, track := range res.stream.tracks() {
switch tt := track.(type) {
@ -313,7 +313,7 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{}) @@ -313,7 +313,7 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{})
audioTrack = tt
audioTrackID = i
aacDecoder = &rtpaac.Decoder{
aacDecoder = &rtpmpeg4audio.Decoder{
SampleRate: tt.Config.SampleRate,
SizeLength: tt.SizeLength,
IndexLength: tt.IndexLength,
@ -378,7 +378,7 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{}) @@ -378,7 +378,7 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{})
} else if audioTrack != nil && data.trackID == audioTrackID {
aus, pts, err := aacDecoder.Decode(data.rtp)
if err != nil {
if err != rtpaac.ErrMorePacketsNeeded {
if err != rtpmpeg4audio.ErrMorePacketsNeeded {
m.log(logger.Warn, "unable to decode audio track: %v", err)
}
continue

6
internal/core/hls_source.go
Unescape View File

@ -6,8 +6,8 @@ import ( @@ -6,8 +6,8 @@ import (
"github.com/aler9/gortsplib"
"github.com/aler9/gortsplib/pkg/h264"
"github.com/aler9/gortsplib/pkg/rtpaac"
"github.com/aler9/gortsplib/pkg/rtph264"
"github.com/aler9/gortsplib/pkg/rtpmpeg4audio"
"github.com/aler9/rtsp-simple-server/internal/hls"
"github.com/aler9/rtsp-simple-server/internal/logger"
@ -47,7 +47,7 @@ func (s *hlsSource) run(ctx context.Context) error { @@ -47,7 +47,7 @@ func (s *hlsSource) run(ctx context.Context) error {
var videoTrackID int
var audioTrackID int
var videoEnc *rtph264.Encoder
var audioEnc *rtpaac.Encoder
var audioEnc *rtpmpeg4audio.Encoder
defer func() {
if stream != nil {
@ -67,7 +67,7 @@ func (s *hlsSource) run(ctx context.Context) error { @@ -67,7 +67,7 @@ func (s *hlsSource) run(ctx context.Context) error {
if audioTrack != nil {
audioTrackID = len(tracks)
audioEnc = &rtpaac.Encoder{
audioEnc = &rtpmpeg4audio.Encoder{
PayloadType: 96,
SampleRate: audioTrack.ClockRate(),
SizeLength: 13,

12
internal/core/rtmp_conn.go
Unescape View File

@ -14,8 +14,8 @@ import ( @@ -14,8 +14,8 @@ import (
"github.com/aler9/gortsplib/pkg/h264"
"github.com/aler9/gortsplib/pkg/mpeg4audio"
"github.com/aler9/gortsplib/pkg/ringbuffer"
"github.com/aler9/gortsplib/pkg/rtpaac"
"github.com/aler9/gortsplib/pkg/rtph264"
"github.com/aler9/gortsplib/pkg/rtpmpeg4audio"
"github.com/notedit/rtmp/format/flv/flvio"
"github.com/aler9/rtsp-simple-server/internal/conf"
@ -256,7 +256,7 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error { @@ -256,7 +256,7 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error {
videoTrackID := -1
var audioTrack *gortsplib.TrackMPEG4Audio
audioTrackID := -1
var aacDecoder *rtpaac.Decoder
var aacDecoder *rtpmpeg4audio.Decoder
for i, track := range res.stream.tracks() {
switch tt := track.(type) {
@ -275,7 +275,7 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error { @@ -275,7 +275,7 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error {
audioTrack = tt
audioTrackID = i
aacDecoder = &rtpaac.Decoder{
aacDecoder = &rtpmpeg4audio.Decoder{
SampleRate: tt.Config.SampleRate,
SizeLength: tt.SizeLength,
IndexLength: tt.IndexLength,
@ -444,7 +444,7 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error { @@ -444,7 +444,7 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error {
} else if audioTrack != nil && data.trackID == audioTrackID {
aus, pts, err := aacDecoder.Decode(data.rtp)
if err != nil {
if err != rtpaac.ErrMorePacketsNeeded {
if err != rtpmpeg4audio.ErrMorePacketsNeeded {
c.log(logger.Warn, "unable to decode audio track: %v", err)
}
continue
@ -499,9 +499,9 @@ func (c *rtmpConn) runPublish(ctx context.Context, u *url.URL) error { @@ -499,9 +499,9 @@ func (c *rtmpConn) runPublish(ctx context.Context, u *url.URL) error {
tracks = append(tracks, videoTrack)
}
var aacEncoder *rtpaac.Encoder
var aacEncoder *rtpmpeg4audio.Encoder
if audioTrack != nil {
aacEncoder = &rtpaac.Encoder{
aacEncoder = &rtpmpeg4audio.Encoder{
PayloadType: 96,
SampleRate: audioTrack.ClockRate(),
SizeLength: 13,

6
internal/core/rtmp_source.go
Unescape View File

@ -9,8 +9,8 @@ import ( @@ -9,8 +9,8 @@ import (
"github.com/aler9/gortsplib"
"github.com/aler9/gortsplib/pkg/h264"
"github.com/aler9/gortsplib/pkg/rtpaac"
"github.com/aler9/gortsplib/pkg/rtph264"
"github.com/aler9/gortsplib/pkg/rtpmpeg4audio"
"github.com/notedit/rtmp/format/flv/flvio"
"github.com/aler9/rtsp-simple-server/internal/conf"
@ -105,9 +105,9 @@ func (s *rtmpSource) run(ctx context.Context) error { @@ -105,9 +105,9 @@ func (s *rtmpSource) run(ctx context.Context) error {
tracks = append(tracks, videoTrack)
}
var aacEncoder *rtpaac.Encoder
var aacEncoder *rtpmpeg4audio.Encoder
if audioTrack != nil {
aacEncoder = &rtpaac.Encoder{
aacEncoder = &rtpmpeg4audio.Encoder{
PayloadType: 96,
SampleRate: audioTrack.ClockRate(),
SizeLength: 13,

Write Preview
Loading…
Cancel
Save