CEF/mediamtx
1
0
Fork 0
forked from External/mediamtx
Code Pull requests Activity

rtmp: rewrite implementation of rtmp connection (#1047)

Browse source 
* rtmp: improve MsgCommandAMF0

* rtmp: fix MsgSetPeerBandwidth

* rtmp: add message tests

* rtmp: replace implementation with new one

* rtmp: rename handshake functions

* rtmp: avoid calling useless function

* rtmp: use time.Duration for PTSDelta

* rtmp: fix decoding chunks with relevant size

* rtmp: rewrite implementation of rtmp connection

* rtmp: fix tests

* rtmp: improve error message

* rtmp: replace h264 config implementation

* link against github.com/notedit/rtmp

* normalize MessageStreamID

* rtmp: make acknowledge optional

* rtmp: fix decoding of chunk2 + chunk3

* avoid using encoding/binary
This commit is contained in:
Alessandro Ros 2022-07-17 15:17:18 +02:00 • committed by GitHub
parent 50d205274f
commit 9e6abc6e9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
45 changed files with 2045 additions and 1064 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/rtmp/message/msg_usercontrol_pingrequest.go
View file

@ -1,7 +1,6 @@
package message
package message //nolint:dupl
import (
"encoding/binary"
"fmt"
"github.com/aler9/rtsp-simple-server/internal/rtmp/chunk"
@ -23,20 +22,25 @@ func (m *MsgUserControlPingRequest) Unmarshal(raw *rawmessage.Message) error {
return fmt.Errorf("invalid body size")
}
m.ServerTime = binary.BigEndian.Uint32(raw.Body[2:])
m.ServerTime = uint32(raw.Body[2])<<24 | uint32(raw.Body[3])<<16 | uint32(raw.Body[4])<<8 | uint32(raw.Body[5])
return nil
}
// Marshal implements Message.
func (m MsgUserControlPingRequest) Marshal() (*rawmessage.Message, error) {
body := make([]byte, 6)
binary.BigEndian.PutUint16(body, UserControlTypePingRequest)
binary.BigEndian.PutUint32(body[2:], m.ServerTime)
buf := make([]byte, 6)
buf[0] = byte(UserControlTypePingRequest >> 8)
buf[1] = byte(UserControlTypePingRequest)
buf[2] = byte(m.ServerTime >> 24)
buf[3] = byte(m.ServerTime >> 16)
buf[4] = byte(m.ServerTime >> 8)
buf[5] = byte(m.ServerTime)
return &rawmessage.Message{
ChunkStreamID: ControlChunkStreamID,
Type: chunk.MessageTypeUserControl,
Body: body,
Body: buf,
}, nil
}