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

allow writing primitives to static buffers

Browse Source
This commit is contained in:
aler9
2022-05-11 14:52:20 +02:00
parent ee6d7a87a3
commit c1b10a80be
19 changed files with 662 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

295
client_publish_test.go
View File

@@ -2,7 +2,6 @@ package gortsplib
import (
"bufio"
"bytes"
"crypto/tls"
"net"
"strings"
@@ -83,15 +82,13 @@ func TestClientPublishSerial(t *testing.T) {
require.NoError(t, err)
defer conn.Close()
br := bufio.NewReader(conn)
var bb bytes.Buffer
req, err := readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Options, req.Method)
require.Equal(t, mustParseURL(scheme+"://localhost:8554/teststream"), req.URL)
bb.Reset()
base.Response{
byts, _ := base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Public": base.HeaderValue{strings.Join([]string{
@@ -100,8 +97,8 @@ func TestClientPublishSerial(t *testing.T) {
string(base.Record),
}, ", ")},
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -109,11 +106,10 @@ func TestClientPublishSerial(t *testing.T) {
require.Equal(t, base.Announce, req.Method)
require.Equal(t, mustParseURL(scheme+"://localhost:8554/teststream"), req.URL)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -153,14 +149,13 @@ func TestClientPublishSerial(t *testing.T) {
th.InterleavedIDs = inTH.InterleavedIDs
}
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Transport": th.Write(),
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -168,11 +163,10 @@ func TestClientPublishSerial(t *testing.T) {
require.Equal(t, base.Record, req.Method)
require.Equal(t, mustParseURL(scheme+"://localhost:8554/teststream"), req.URL)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
// client -> server (RTP)
@@ -202,12 +196,11 @@ func TestClientPublishSerial(t *testing.T) {
Port: th.ClientPorts[1],
})
} else {
bb.Reset()
base.InterleavedFrame{
byts, _ := base.InterleavedFrame{
Channel: 1,
Payload: testRTCPPacketMarshaled,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
}
@@ -216,11 +209,10 @@ func TestClientPublishSerial(t *testing.T) {
require.Equal(t, base.Teardown, req.Method)
require.Equal(t, mustParseURL(scheme+"://localhost:8554/teststream"), req.URL)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
}()
@@ -303,14 +295,12 @@ func TestClientPublishParallel(t *testing.T) {
require.NoError(t, err)
defer conn.Close()
br := bufio.NewReader(conn)
var bb bytes.Buffer
req, err := readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Options, req.Method)
bb.Reset()
base.Response{
byts, _ := base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Public": base.HeaderValue{strings.Join([]string{
@@ -319,19 +309,18 @@ func TestClientPublishParallel(t *testing.T) {
string(base.Record),
}, ", ")},
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Announce, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -358,36 +347,33 @@ func TestClientPublishParallel(t *testing.T) {
th.InterleavedIDs = inTH.InterleavedIDs
}
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Transport": th.Write(),
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Record, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequestIgnoreFrames(br)
require.NoError(t, err)
require.Equal(t, base.Teardown, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
}()
@@ -454,14 +440,12 @@ func TestClientPublishPauseSerial(t *testing.T) {
require.NoError(t, err)
defer conn.Close()
br := bufio.NewReader(conn)
var bb bytes.Buffer
req, err := readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Options, req.Method)
bb.Reset()
base.Response{
byts, _ := base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Public": base.HeaderValue{strings.Join([]string{
@@ -471,19 +455,18 @@ func TestClientPublishPauseSerial(t *testing.T) {
string(base.Pause),
}, ", ")},
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Announce, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -510,58 +493,53 @@ func TestClientPublishPauseSerial(t *testing.T) {
th.InterleavedIDs = inTH.InterleavedIDs
}
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Transport": th.Write(),
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Record, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequestIgnoreFrames(br)
require.NoError(t, err)
require.Equal(t, base.Pause, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Record, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequestIgnoreFrames(br)
require.NoError(t, err)
require.Equal(t, base.Teardown, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
}()
@@ -618,14 +596,12 @@ func TestClientPublishPauseParallel(t *testing.T) {
require.NoError(t, err)
defer conn.Close()
br := bufio.NewReader(conn)
var bb bytes.Buffer
req, err := readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Options, req.Method)
bb.Reset()
base.Response{
byts, _ := base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Public": base.HeaderValue{strings.Join([]string{
@@ -635,19 +611,18 @@ func TestClientPublishPauseParallel(t *testing.T) {
string(base.Pause),
}, ", ")},
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Announce, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -674,36 +649,33 @@ func TestClientPublishPauseParallel(t *testing.T) {
th.InterleavedIDs = inTH.InterleavedIDs
}
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Transport": th.Write(),
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Record, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequestIgnoreFrames(br)
require.NoError(t, err)
require.Equal(t, base.Pause, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
}()
@@ -765,15 +737,13 @@ func TestClientPublishAutomaticProtocol(t *testing.T) {
require.NoError(t, err)
defer conn.Close()
br := bufio.NewReader(conn)
var bb bytes.Buffer
req, err := readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Options, req.Method)
require.Equal(t, mustParseURL("rtsp://localhost:8554/teststream"), req.URL)
bb.Reset()
base.Response{
byts, _ := base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Public": base.HeaderValue{strings.Join([]string{
@@ -782,8 +752,8 @@ func TestClientPublishAutomaticProtocol(t *testing.T) {
string(base.Record),
}, ", ")},
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -791,22 +761,20 @@ func TestClientPublishAutomaticProtocol(t *testing.T) {
require.Equal(t, base.Announce, req.Method)
require.Equal(t, mustParseURL("rtsp://localhost:8554/teststream"), req.URL)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Setup, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusUnsupportedTransport,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -827,14 +795,13 @@ func TestClientPublishAutomaticProtocol(t *testing.T) {
InterleavedIDs: &[2]int{0, 1},
}
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Transport": th.Write(),
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -842,11 +809,10 @@ func TestClientPublishAutomaticProtocol(t *testing.T) {
require.Equal(t, base.Record, req.Method)
require.Equal(t, mustParseURL("rtsp://localhost:8554/teststream"), req.URL)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
var f base.InterleavedFrame
@@ -862,11 +828,10 @@ func TestClientPublishAutomaticProtocol(t *testing.T) {
require.NoError(t, err)
require.Equal(t, base.Teardown, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
}()
@@ -900,14 +865,12 @@ func TestClientPublishRTCPReport(t *testing.T) {
require.NoError(t, err)
defer conn.Close()
br := bufio.NewReader(conn)
var bb bytes.Buffer
req, err := readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Options, req.Method)
bb.Reset()
base.Response{
byts, _ := base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Public": base.HeaderValue{strings.Join([]string{
@@ -916,19 +879,18 @@ func TestClientPublishRTCPReport(t *testing.T) {
string(base.Record),
}, ", ")},
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Announce, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -947,8 +909,7 @@ func TestClientPublishRTCPReport(t *testing.T) {
require.NoError(t, err)
defer l2.Close()
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Transport": headers.Transport{
@@ -961,19 +922,18 @@ func TestClientPublishRTCPReport(t *testing.T) {
ServerPorts: &[2]int{34556, 34557},
}.Write(),
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Record, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
buf := make([]byte, 2048)
@@ -1004,11 +964,10 @@ func TestClientPublishRTCPReport(t *testing.T) {
require.NoError(t, err)
require.Equal(t, base.Teardown, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
}()
@@ -1054,14 +1013,12 @@ func TestClientPublishIgnoreTCPRTPPackets(t *testing.T) {
require.NoError(t, err)
defer conn.Close()
br := bufio.NewReader(conn)
var bb bytes.Buffer
req, err := readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Options, req.Method)
bb.Reset()
base.Response{
byts, _ := base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Public": base.HeaderValue{strings.Join([]string{
@@ -1070,19 +1027,18 @@ func TestClientPublishIgnoreTCPRTPPackets(t *testing.T) {
string(base.Record),
}, ", ")},
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Announce, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
@@ -1102,52 +1058,47 @@ func TestClientPublishIgnoreTCPRTPPackets(t *testing.T) {
InterleavedIDs: inTH.InterleavedIDs,
}
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
Header: base.Header{
"Transport": th.Write(),
},
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Record, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
bb.Reset()
base.InterleavedFrame{
byts, _ = base.InterleavedFrame{
Channel: 0,
Payload: testRTPPacketMarshaled,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
bb.Reset()
base.InterleavedFrame{
byts, _ = base.InterleavedFrame{
Channel: 1,
Payload: testRTCPPacketMarshaled,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
req, err = readRequest(br)
require.NoError(t, err)
require.Equal(t, base.Teardown, req.Method)
bb.Reset()
base.Response{
byts, _ = base.Response{
StatusCode: base.StatusOK,
}.Write(&bb)
_, err = conn.Write(bb.Bytes())
}.Write()
_, err = conn.Write(byts)
require.NoError(t, err)
}()