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

simplify usage of Conn

Browse Source
This commit is contained in:
aler9
2022-08-15 00:10:21 +02:00
parent 06bed24dd9
commit 27f8015ac6
10 changed files with 284 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server_read_test.go
View File

@@ -518,8 +518,7 @@ func TestServerRead(t *testing.T) {
require.Equal(t, testRTCPPacketMarshaled, buf[:n])
case "tcp", "tls":
var f base.InterleavedFrame
err := conn.ReadInterleavedFrame(&f)
f, err := conn.ReadInterleavedFrame()
require.NoError(t, err)
switch f.Channel {
@@ -546,10 +545,8 @@ func TestServerRead(t *testing.T) {
require.NoError(t, err)
require.Equal(t, testRTCPPacketMarshaled, buf[:n])
} else {
var f base.InterleavedFrame
for i := 0; i < 2; i++ {
err := conn.ReadInterleavedFrame(&f)
f, err := conn.ReadInterleavedFrame()
require.NoError(t, err)
switch f.Channel {
@@ -899,8 +896,7 @@ func TestServerReadTCPResponseBeforeFrames(t *testing.T) {
require.NoError(t, err)
require.Equal(t, base.StatusOK, res.StatusCode)
var f base.InterleavedFrame
err = conn.ReadInterleavedFrame(&f)
_, err = conn.ReadInterleavedFrame()
require.NoError(t, err)
}
@@ -1227,7 +1223,7 @@ func TestServerReadPlayPausePause(t *testing.T) {
})
require.NoError(t, err)
res, err = readResIgnoreFrames(conn)
res, err = conn.ReadResponseIgnoreFrames()
require.NoError(t, err)
require.Equal(t, base.StatusOK, res.StatusCode)
@@ -1241,7 +1237,7 @@ func TestServerReadPlayPausePause(t *testing.T) {
})
require.NoError(t, err)
res, err = readResIgnoreFrames(conn)
res, err = conn.ReadResponseIgnoreFrames()
require.NoError(t, err)
require.Equal(t, base.StatusOK, res.StatusCode)
}
@@ -1667,8 +1663,7 @@ func TestServerReadPartialTracks(t *testing.T) {
require.NoError(t, err)
require.Equal(t, base.StatusOK, res.StatusCode)
var f base.InterleavedFrame
err = conn.ReadInterleavedFrame(&f)
f, err := conn.ReadInterleavedFrame()
require.NoError(t, err)
require.Equal(t, 4, f.Channel)
require.Equal(t, testRTPPacketMarshaled, f.Payload)