package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-04 06:46:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

server: split WriteFrame into WritePacketRTP and WritePacketRTCP

Browse Source
This commit is contained in:
aler9
2021-10-30 16:15:04 +02:00
committed by Alessandro Ros
parent 472430f900
commit 2882bacdf2
10 changed files with 105 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/server-tls/main.go
View File

@@ -131,7 +131,7 @@ func (sh *serverHandler) OnPacketRTP(ctx *gortsplib.ServerHandlerOnPacketRTPCtx)
// if we are the publisher, route packet to readers
if ctx.Session == sh.publisher {
sh.stream.WriteFrame(ctx.TrackID, gortsplib.StreamTypeRTP, ctx.Payload)
sh.stream.WritePacketRTP(ctx.TrackID, ctx.Payload)
}
}
@@ -142,7 +142,7 @@ func (sh *serverHandler) OnPacketRTCP(ctx *gortsplib.ServerHandlerOnPacketRTPCtx
// if we are the publisher, route packet to readers
if ctx.Session == sh.publisher {
sh.stream.WriteFrame(ctx.TrackID, gortsplib.StreamTypeRTCP, ctx.Payload)
sh.stream.WritePacketRTCP(ctx.TrackID, ctx.Payload)
}
}

4
examples/server/main.go
View File

@@ -130,7 +130,7 @@ func (sh *serverHandler) OnPacketRTP(ctx *gortsplib.ServerHandlerOnPacketRTPCtx)
// if we are the publisher, route packet to readers
if ctx.Session == sh.publisher {
sh.stream.WriteFrame(ctx.TrackID, gortsplib.StreamTypeRTP, ctx.Payload)
sh.stream.WritePacketRTP(ctx.TrackID, ctx.Payload)
}
}
@@ -141,7 +141,7 @@ func (sh *serverHandler) OnPacketRTCP(ctx *gortsplib.ServerHandlerOnPacketRTPCtx
// if we are the publisher, route packet to readers
if ctx.Session == sh.publisher {
sh.stream.WriteFrame(ctx.TrackID, gortsplib.StreamTypeRTCP, ctx.Payload)
sh.stream.WritePacketRTCP(ctx.TrackID, ctx.Payload)
}
}

2
server_publish_test.go
View File

@@ -651,7 +651,7 @@ func TestServerPublish(t *testing.T) {
onPacketRTCP: func(ctx *ServerHandlerOnPacketRTCPCtx) {
require.Equal(t, 0, ctx.TrackID)
require.Equal(t, []byte{0x05, 0x06, 0x07, 0x08}, ctx.Payload)
ctx.Session.WriteFrame(0, StreamTypeRTCP, []byte{0x09, 0x0A, 0x0B, 0x0C})
ctx.Session.WritePacketRTCP(0, []byte{0x09, 0x0A, 0x0B, 0x0C})
},
},
}

24
server_read_test.go
View File

@@ -295,8 +295,8 @@ func TestServerRead(t *testing.T) {
onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) {
go func() {
time.Sleep(1 * time.Second)
stream.WriteFrame(0, StreamTypeRTP, []byte{0x01, 0x02, 0x03, 0x04})
stream.WriteFrame(0, StreamTypeRTCP, []byte{0x05, 0x06, 0x07, 0x08})
stream.WritePacketRTP(0, []byte{0x01, 0x02, 0x03, 0x04})
stream.WritePacketRTCP(0, []byte{0x05, 0x06, 0x07, 0x08})
}()
return &base.Response{
@@ -673,7 +673,7 @@ func TestServerReadTCPResponseBeforeFrames(t *testing.T) {
go func() {
defer close(writerDone)
stream.WriteFrame(0, StreamTypeRTP, []byte("\x00\x00\x00\x00"))
stream.WritePacketRTP(0, []byte("\x00\x00\x00\x00"))
t := time.NewTicker(50 * time.Millisecond)
defer t.Stop()
@@ -681,7 +681,7 @@ func TestServerReadTCPResponseBeforeFrames(t *testing.T) {
for {
select {
case <-t.C:
stream.WriteFrame(0, StreamTypeRTP, []byte("\x00\x00\x00\x00"))
stream.WritePacketRTP(0, []byte("\x00\x00\x00\x00"))
case <-writerTerminate:
return
}
@@ -857,7 +857,7 @@ func TestServerReadPlayPausePlay(t *testing.T) {
for {
select {
case <-t.C:
stream.WriteFrame(0, StreamTypeRTP, []byte("\x00\x00\x00\x00"))
stream.WritePacketRTP(0, []byte("\x00\x00\x00\x00"))
case <-writerTerminate:
return
}
@@ -973,7 +973,7 @@ func TestServerReadPlayPausePause(t *testing.T) {
for {
select {
case <-t.C:
stream.WriteFrame(0, StreamTypeRTP, []byte("\x00\x00\x00\x00"))
stream.WritePacketRTP(0, []byte("\x00\x00\x00\x00"))
case <-writerTerminate:
return
}
@@ -1477,8 +1477,8 @@ func TestServerReadNonSetuppedPath(t *testing.T) {
onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) {
go func() {
time.Sleep(1 * time.Second)
stream.WriteFrame(1, base.StreamTypeRTP, []byte{0x01, 0x02, 0x03, 0x04})
stream.WriteFrame(0, base.StreamTypeRTP, []byte{0x05, 0x06, 0x07, 0x08})
stream.WritePacketRTP(1, []byte{0x01, 0x02, 0x03, 0x04})
stream.WritePacketRTP(0, []byte{0x05, 0x06, 0x07, 0x08})
}()
return &base.Response{
@@ -1642,8 +1642,8 @@ func TestServerReadAdditionalInfos(t *testing.T) {
onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) {
go func() {
time.Sleep(1 * time.Second)
stream.WriteFrame(1, base.StreamTypeRTP, []byte{0x01, 0x02, 0x03, 0x04})
stream.WriteFrame(0, base.StreamTypeRTP, []byte{0x05, 0x06, 0x07, 0x08})
stream.WritePacketRTP(1, []byte{0x01, 0x02, 0x03, 0x04})
stream.WritePacketRTP(0, []byte{0x05, 0x06, 0x07, 0x08})
}()
return &base.Response{
@@ -1669,7 +1669,7 @@ func TestServerReadAdditionalInfos(t *testing.T) {
Payload: []byte{0x01, 0x02, 0x03, 0x04},
}).Marshal()
require.NoError(t, err)
stream.WriteFrame(0, StreamTypeRTP, buf)
stream.WritePacketRTP(0, buf)
rtpInfo, ssrcs := getInfos()
require.Equal(t, &headers.RTPInfo{
@@ -1705,7 +1705,7 @@ func TestServerReadAdditionalInfos(t *testing.T) {
Payload: []byte{0x01, 0x02, 0x03, 0x04},
}).Marshal()
require.NoError(t, err)
stream.WriteFrame(1, StreamTypeRTP, buf)
stream.WritePacketRTP(1, buf)
rtpInfo, ssrcs = getInfos()
require.Equal(t, &headers.RTPInfo{

4
server_test.go
View File

@@ -404,7 +404,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
defer mutex.Unlock()
if ctx.Session == publisher {
stream.WriteFrame(ctx.TrackID, StreamTypeRTP, ctx.Payload)
stream.WritePacketRTP(ctx.TrackID, ctx.Payload)
}
},
onPacketRTCP: func(ctx *ServerHandlerOnPacketRTCPCtx) {
@@ -412,7 +412,7 @@ func TestServerHighLevelPublishRead(t *testing.T) {
defer mutex.Unlock()
if ctx.Session == publisher {
stream.WriteFrame(ctx.TrackID, StreamTypeRTCP, ctx.Payload)
stream.WritePacketRTCP(ctx.TrackID, ctx.Payload)
}
},
},

52
serversession.go
View File

@@ -339,7 +339,7 @@ func (ss *ServerSession) run() {
now := time.Now()
for trackID, track := range ss.announcedTracks {
r := track.rtcpReceiver.Report(now)
ss.WriteFrame(trackID, StreamTypeRTCP, r)
ss.WritePacketRTCP(trackID, r)
}
case <-ss.ctx.Done():
@@ -863,7 +863,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
sc.s.udpRTCPListener.addClient(ss.author.ip(), track.udpRTCPPort, ss, trackID, false)
// open the firewall by sending packets to the counterpart
ss.WriteFrame(trackID, StreamTypeRTCP,
ss.WritePacketRTCP(trackID,
[]byte{0x80, 0xc9, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00})
}
@@ -905,7 +905,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
path, query := base.PathSplitQuery(pathAndQuery)
// allow to use WriteFrame() before response
// allow to use WritePacket*() before response
if *ss.setuppedTransport == TransportTCP {
ss.tcpConn = sc
}
@@ -938,9 +938,9 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
ss.s.udpRTCPListener.addClient(ss.author.ip(), track.udpRTCPPort, ss, trackID, true)
// open the firewall by sending packets to the counterpart
ss.WriteFrame(trackID, StreamTypeRTP,
ss.WritePacketRTP(trackID,
[]byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00})
ss.WriteFrame(trackID, StreamTypeRTCP,
ss.WritePacketRTCP(trackID,
[]byte{0x80, 0xc9, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00})
}
@@ -1065,8 +1065,8 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
}, liberrors.ErrServerUnhandledRequest{Req: req}
}
// WriteFrame writes a frame to the session.
func (ss *ServerSession) WriteFrame(trackID int, streamType StreamType, payload []byte) {
// WritePacketRTP writes a RTP packet to the session.
func (ss *ServerSession) WritePacketRTP(trackID int, payload []byte) {
if _, ok := ss.setuppedTracks[trackID]; !ok {
return
}
@@ -1075,25 +1075,41 @@ func (ss *ServerSession) WriteFrame(trackID int, streamType StreamType, payload
case TransportUDP:
track := ss.setuppedTracks[trackID]
if streamType == StreamTypeRTP {
ss.s.udpRTPListener.write(payload, &net.UDPAddr{
IP: ss.author.ip(),
Zone: ss.author.zone(),
Port: track.udpRTPPort,
})
} else {
ss.s.udpRTCPListener.write(payload, &net.UDPAddr{
IP: ss.author.ip(),
Zone: ss.author.zone(),
Port: track.udpRTCPPort,
})
}
case TransportTCP:
channel := ss.setuppedTracks[trackID].tcpChannel
if streamType == base.StreamTypeRTCP {
channel++
}
ss.tcpConn.tcpFrameWriteBuffer.Push(&base.InterleavedFrame{
Channel: channel,
Payload: payload,
})
}
}
// WritePacketRTCP writes a RTCP packet to the session.
func (ss *ServerSession) WritePacketRTCP(trackID int, payload []byte) {
if _, ok := ss.setuppedTracks[trackID]; !ok {
return
}
switch *ss.setuppedTransport {
case TransportUDP:
track := ss.setuppedTracks[trackID]
ss.s.udpRTCPListener.write(payload, &net.UDPAddr{
IP: ss.author.ip(),
Zone: ss.author.zone(),
Port: track.udpRTCPPort,
})
case TransportTCP:
channel := ss.setuppedTracks[trackID].tcpChannel
channel++
ss.tcpConn.tcpFrameWriteBuffer.Push(&base.InterleavedFrame{
Channel: channel,

28
serverstream.go
View File

@@ -221,9 +221,9 @@ func (st *ServerStream) readerSetInactive(ss *ServerSession) {
}
}
// WriteFrame writes a frame to all the readers of the stream.
func (st *ServerStream) WriteFrame(trackID int, streamType StreamType, payload []byte) {
if streamType == StreamTypeRTP && len(payload) >= 8 {
// WritePacketRTP writes a RTP packet to all the readers of the stream.
func (st *ServerStream) WritePacketRTP(trackID int, payload []byte) {
if len(payload) >= 8 {
track := st.trackInfos[trackID]
sequenceNumber := binary.BigEndian.Uint16(payload[2:4])
@@ -242,21 +242,33 @@ func (st *ServerStream) WriteFrame(trackID int, streamType StreamType, payload [
// send unicast
for r := range st.readersUnicast {
r.WriteFrame(trackID, streamType, payload)
r.WritePacketRTP(trackID, payload)
}
// send multicast
if st.multicastListeners != nil {
if streamType == StreamTypeRTP {
st.multicastListeners[trackID].rtpListener.write(payload, &net.UDPAddr{
IP: st.multicastListeners[trackID].rtpListener.ip(),
Port: st.multicastListeners[trackID].rtpListener.port(),
})
} else {
}
}
// WritePacketRTCP writes a RTCP packet to all the readers of the stream.
func (st *ServerStream) WritePacketRTCP(trackID int, payload []byte) {
st.mutex.RLock()
defer st.mutex.RUnlock()
// send unicast
for r := range st.readersUnicast {
r.WritePacketRTCP(trackID, payload)
}
// send multicast
if st.multicastListeners != nil {
st.multicastListeners[trackID].rtcpListener.write(payload, &net.UDPAddr{
IP: st.multicastListeners[trackID].rtpListener.ip(),
IP: st.multicastListeners[trackID].rtcpListener.ip(),
Port: st.multicastListeners[trackID].rtcpListener.port(),
})
}
}
}