External/mediamtx
1
0
Fork 1
mirror of https://github.com/bluenviron/mediamtx.git synced 2026-01-26 13:29:15 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

update gortsplib

Browse source
This commit is contained in:
aler9 2022-06-24 17:00:28 +02:00
parent 40aa24a6d8
commit 41b08c9f50
11 changed files with 66 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/rtmp/conn.go
View file

@ -98,20 +98,17 @@ func trackFromH264DecoderConfig(data []byte) (*gortsplib.TrackH264, error) {
func trackFromAACDecoderConfig(data []byte) (*gortsplib.TrackAAC, error) {
var mpegConf aac.MPEG4AudioConfig
err := mpegConf.Decode(data)
err := mpegConf.Unmarshal(data)
if err != nil {
return nil, err
}
return &gortsplib.TrackAAC{
PayloadType: 97,
Type: int(mpegConf.Type),
SampleRate: mpegConf.SampleRate,
ChannelCount: mpegConf.ChannelCount,
AOTSpecificConfig: mpegConf.AOTSpecificConfig,
SizeLength: 13,
IndexLength: 3,
IndexDeltaLength: 3,
PayloadType: 97,
Config: &mpegConf,
SizeLength: 13,
IndexLength: 3,
IndexDeltaLength: 3,
}, nil
}
@ -395,12 +392,7 @@ func (c *Conn) WriteTracks(videoTrack *gortsplib.TrackH264, audioTrack *gortspli
}
if audioTrack != nil {
enc, err := aac.MPEG4AudioConfig{
Type: aac.MPEG4AudioType(audioTrack.Type),
SampleRate: audioTrack.SampleRate,
ChannelCount: audioTrack.ChannelCount,
AOTSpecificConfig: audioTrack.AOTSpecificConfig,
}.Encode()
enc, err := audioTrack.Config.Marshal()
if err != nil {
return err
}

46
internal/rtmp/conn_test.go
View file

@ -92,10 +92,12 @@ func TestReadTracks(t *testing.T) {
}, videoTrack)
require.Equal(t, &gortsplib.TrackAAC{
PayloadType: 97,
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
PayloadType: 97,
Config: &aac.MPEG4AudioConfig{
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
},
SizeLength: 13,
IndexLength: 3,
IndexDeltaLength: 3,
@ -109,10 +111,12 @@ func TestReadTracks(t *testing.T) {
}, videoTrack)
require.Equal(t, &gortsplib.TrackAAC{
PayloadType: 97,
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
PayloadType: 97,
Config: &aac.MPEG4AudioConfig{
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
},
SizeLength: 13,
IndexLength: 3,
IndexDeltaLength: 3,
@ -126,10 +130,12 @@ func TestReadTracks(t *testing.T) {
}, videoTrack)
require.Equal(t, &gortsplib.TrackAAC{
PayloadType: 97,
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
PayloadType: 97,
Config: &aac.MPEG4AudioConfig{
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
},
SizeLength: 13,
IndexLength: 3,
IndexDeltaLength: 3,
@ -378,7 +384,7 @@ func TestReadTracks(t *testing.T) {
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
}.Encode()
}.Marshal()
require.NoError(t, err)
err = mrw.Write(&message.MsgAudio{
ChunkStreamID: 4,
@ -443,7 +449,7 @@ func TestReadTracks(t *testing.T) {
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
}.Encode()
}.Marshal()
require.NoError(t, err)
err = mrw.Write(&message.MsgAudio{
ChunkStreamID: 4,
@ -483,7 +489,7 @@ func TestReadTracks(t *testing.T) {
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
}.Encode()
}.Marshal()
require.NoError(t, err)
err = mrw.Write(&message.MsgAudio{
ChunkStreamID: 4,
@ -529,10 +535,12 @@ func TestWriteTracks(t *testing.T) {
}
audioTrack := &gortsplib.TrackAAC{
PayloadType: 97,
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
PayloadType: 97,
Config: &aac.MPEG4AudioConfig{
Type: 2,
SampleRate: 44100,
ChannelCount: 2,
},
SizeLength: 13,
IndexLength: 3,
IndexDeltaLength: 3,