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

server: allow calling ServerSession.WritePacketRTCP() inside OnRecord and OnPlay (#99)

Browse Source
This commit is contained in:
aler9
2022-02-18 23:19:33 +01:00
parent cbc228acbf
commit 86fb4181c7
4 changed files with 109 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
server_read_test.go
View File

@@ -287,10 +287,19 @@ func TestServerRead(t *testing.T) {
}, stream, nil
},
onPlay: func(ctx *ServerHandlerOnPlayCtx) (*base.Response, error) {
// send RTCP packets directly to the session.
// these are sent after the response, only if onPlay returns StatusOK.
if transport != "multicast" {
ctx.Session.WritePacketRTCP(0, &testRTCPPacket)
}
// the session is added to the stream only after onPlay returns
// with StatusOK; therefore we must wait before calling
// ServerStream.WritePacket*()
go func() {
time.Sleep(1 * time.Second)
stream.WritePacketRTP(0, &testRTPPacket)
stream.WritePacketRTCP(0, &testRTCPPacket)
stream.WritePacketRTP(0, &testRTPPacket)
}()
return &base.Response{
@@ -461,37 +470,70 @@ func TestServerRead(t *testing.T) {
require.NoError(t, err)
require.Equal(t, base.StatusOK, res.StatusCode)
// server -> client
// skip firewall opening
if transport == "udp" {
buf := make([]byte, 2048)
_, _, err := l2.ReadFrom(buf)
require.NoError(t, err)
}
// server -> client (direct)
switch transport {
case "udp":
buf := make([]byte, 2048)
n, _, err := l2.ReadFrom(buf)
require.NoError(t, err)
require.Equal(t, testRTCPPacketMarshaled, buf[:n])
case "tcp", "tls":
var f base.InterleavedFrame
f.Payload = make([]byte, 2048)
err := f.Read(br)
require.NoError(t, err)
switch f.Channel {
case 4:
require.Equal(t, testRTPPacketMarshaled, f.Payload)
case 5:
require.Equal(t, testRTCPPacketMarshaled, f.Payload)
default:
t.Errorf("should not happen")
}
}
// server -> client (through stream)
if transport == "udp" || transport == "multicast" {
buf := make([]byte, 2048)
n, _, err := l1.ReadFrom(buf)
require.NoError(t, err)
require.Equal(t, testRTPPacketMarshaled, buf[:n])
// skip firewall opening
if transport == "udp" {
buf := make([]byte, 2048)
_, _, err := l2.ReadFrom(buf)
require.NoError(t, err)
}
buf = make([]byte, 2048)
n, _, err = l2.ReadFrom(buf)
require.NoError(t, err)
require.Equal(t, testRTCPPacketMarshaled, buf[:n])
} else {
var f base.InterleavedFrame
f.Payload = make([]byte, 2048)
err := f.Read(br)
require.NoError(t, err)
require.Equal(t, 4, f.Channel)
require.Equal(t, testRTPPacketMarshaled, f.Payload)
f.Payload = make([]byte, 2048)
err = f.Read(br)
require.NoError(t, err)
require.Equal(t, 5, f.Channel)
require.Equal(t, testRTCPPacketMarshaled, f.Payload)
for i := 0; i < 2; i++ {
f.Payload = make([]byte, 2048)
err := f.Read(br)
require.NoError(t, err)
switch f.Channel {
case 4:
require.Equal(t, testRTPPacketMarshaled, f.Payload)
case 5:
require.Equal(t, testRTCPPacketMarshaled, f.Payload)
default:
t.Errorf("should not happen")
}
}
}
// client -> server (RTCP)