package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-31 02:26:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

move time as first argument in rtcpreceiver, rtcpsender, rtpaac, rtph264

Browse Source
This commit is contained in:
aler9
2020-11-28 11:44:41 +01:00
parent 0c292dec9d
commit f82fe2309d
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/rtph264/encoder.go
View File

@@ -32,7 +32,7 @@ func NewEncoder(payloadType uint8) (*Encoder, error) {
}
// Write encodes NALUs into RTP/H264 packets.
func (e *Encoder) Write(nalus [][]byte, ts time.Duration) ([][]byte, error) {
func (e *Encoder) Write(ts time.Duration, nalus [][]byte) ([][]byte, error) {
if e.started == 0 {
e.started = ts
}
@@ -43,7 +43,7 @@ func (e *Encoder) Write(nalus [][]byte, ts time.Duration) ([][]byte, error) {
var frames [][]byte
for i, nalu := range nalus {
naluFrames, err := e.writeNALU(nalu, rtpTime, (i == len(nalus)-1))
naluFrames, err := e.writeNALU(rtpTime, nalu, (i == len(nalus)-1))
if err != nil {
return nil, err
}
@@ -53,17 +53,17 @@ func (e *Encoder) Write(nalus [][]byte, ts time.Duration) ([][]byte, error) {
return frames, nil
}
func (e *Encoder) writeNALU(nalu []byte, rtpTime uint32, isFinal bool) ([][]byte, error) {
func (e *Encoder) writeNALU(rtpTime uint32, nalu []byte, isFinal bool) ([][]byte, error) {
// if the NALU fits into a single RTP packet, use a single NALU payload
if len(nalu) < rtpPayloadMaxSize {
return e.writeSingle(nalu, rtpTime, isFinal)
return e.writeSingle(rtpTime, nalu, isFinal)
}
// otherwise, split the NALU into multiple fragmentation payloads
return e.writeFragmented(nalu, rtpTime, isFinal)
return e.writeFragmented(rtpTime, nalu, isFinal)
}
func (e *Encoder) writeSingle(nalu []byte, rtpTime uint32, isFinal bool) ([][]byte, error) {
func (e *Encoder) writeSingle(rtpTime uint32, nalu []byte, isFinal bool) ([][]byte, error) {
rpkt := rtp.Packet{
Header: rtp.Header{
Version: rtpVersion,
@@ -88,7 +88,7 @@ func (e *Encoder) writeSingle(nalu []byte, rtpTime uint32, isFinal bool) ([][]by
return [][]byte{frame}, nil
}
func (e *Encoder) writeFragmented(nalu []byte, rtpTime uint32, isFinal bool) ([][]byte, error) {
func (e *Encoder) writeFragmented(rtpTime uint32, nalu []byte, isFinal bool) ([][]byte, error) {
// use only FU-A, not FU-B, since we always use non-interleaved mode
// (packetization-mode=1)
frameCount := (len(nalu) - 1) / (rtpPayloadMaxSize - 2)