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

client: invert arguments of Setup() and SetupAll()

Browse Source
This commit is contained in:
aler9
2023-08-16 19:05:19 +02:00
parent 5e5a21240d
commit 939c065f6f
21 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client.go
View File

@@ -453,7 +453,7 @@ func (c *Client) StartRecording(address string, medias media.Medias) error {
return err
}
err = c.SetupAll(medias, u)
err = c.SetupAll(u, medias)
if err != nil {
c.Close()
return err
@@ -507,7 +507,7 @@ func (c *Client) runInner() error {
req.res <- clientRes{res: res, err: err}
case req := <-c.setup:
res, err := c.doSetup(req.media, req.baseURL, req.rtpPort, req.rtcpPort)
res, err := c.doSetup(req.baseURL, req.media, req.rtpPort, req.rtcpPort)
req.res <- clientRes{res: res, err: err}
case req := <-c.play:
@@ -624,7 +624,7 @@ func (c *Client) trySwitchingProtocol() error {
}
for i, cm := range prevMedias {
_, err := c.doSetup(cm.media, prevBaseURL, 0, 0)
_, err := c.doSetup(prevBaseURL, cm.media, 0, 0)
if err != nil {
return err
}
@@ -660,7 +660,7 @@ func (c *Client) trySwitchingProtocol2(medi *media.Media, baseURL *url.URL) (*ba
return nil, err
}
return c.doSetup(medi, baseURL, 0, 0)
return c.doSetup(baseURL, medi, 0, 0)
}
func (c *Client) playRecordStart() {
@@ -1122,8 +1122,8 @@ func (c *Client) Announce(u *url.URL, medias media.Medias) (*base.Response, erro
}
func (c *Client) doSetup(
medi *media.Media,
baseURL *url.URL,
medi *media.Media,
rtpPort int,
rtcpPort int,
) (*base.Response, error) {
@@ -1235,7 +1235,7 @@ func (c *Client) doSetup(
c.OnTransportSwitch(fmt.Errorf("switching to TCP because server requested it"))
v := TransportTCP
c.effectiveTransport = &v
return c.doSetup(medi, baseURL, 0, 0)
return c.doSetup(baseURL, medi, 0, 0)
}
return nil, liberrors.ErrClientBadStatusCode{Code: res.StatusCode, Message: res.StatusMessage}
@@ -1412,8 +1412,8 @@ func (c *Client) findFreeChannelPair() int {
// rtpPort and rtcpPort are used only if transport is UDP.
// if rtpPort and rtcpPort are zero, they are chosen automatically.
func (c *Client) Setup(
media *media.Media,
baseURL *url.URL,
media *media.Media,
rtpPort int,
rtcpPort int,
) (*base.Response, error) {
@@ -1435,9 +1435,9 @@ func (c *Client) Setup(
}
// SetupAll setups all the given medias.
func (c *Client) SetupAll(medias media.Medias, baseURL *url.URL) error {
func (c *Client) SetupAll(baseURL *url.URL, medias media.Medias) error {
for _, m := range medias {
_, err := c.Setup(m, baseURL, 0, 0)
_, err := c.Setup(baseURL, m, 0, 0)
if err != nil {
return err
}

8
client_play_test.go
View File

@@ -55,7 +55,7 @@ func readAll(c *Client, ur string, cb func(*media.Media, format.Format, *rtp.Pac
return err
}
err = c.SetupAll(medias, baseURL)
err = c.SetupAll(baseURL, medias)
if err != nil {
c.Close()
return err
@@ -493,7 +493,7 @@ func TestClientPlay(t *testing.T) {
medias, baseURL, _, err := c.Describe(u)
require.NoError(t, err)
err = c.SetupAll(medias, baseURL)
err = c.SetupAll(baseURL, medias)
require.NoError(t, err)
c.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) {
@@ -649,7 +649,7 @@ func TestClientPlayPartial(t *testing.T) {
medias, baseURL, _, err := c.Describe(u)
require.NoError(t, err)
_, err = c.Setup(medias[1], baseURL, 0, 0)
_, err = c.Setup(baseURL, medias[1], 0, 0)
require.NoError(t, err)
c.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) {
@@ -2617,7 +2617,7 @@ func TestClientPlaySeek(t *testing.T) {
medias, baseURL, _, err := c.Describe(u)
require.NoError(t, err)
err = c.SetupAll(medias, baseURL)
err = c.SetupAll(baseURL, medias)
require.NoError(t, err)
_, err = c.Play(&headers.Range{

2
client_record_test.go
View File

@@ -82,7 +82,7 @@ func record(c *Client, ur string, medias media.Medias, cb func(*media.Media, rtc
return err
}
err = c.SetupAll(medias, u)
err = c.SetupAll(u, medias)
if err != nil {
c.Close()
return err

2
examples/client-read-format-g711/main.go
View File

@@ -50,7 +50,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-g722/main.go
View File

@@ -50,7 +50,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-h264-convert-to-jpeg/main.go
View File

@@ -92,7 +92,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-h264-save-to-disk/main.go
View File

@@ -57,7 +57,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-h264/main.go
View File

@@ -69,7 +69,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-h265/main.go
View File

@@ -51,7 +51,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-lpcm/main.go
View File

@@ -50,7 +50,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-mjpeg/main.go
View File

@@ -54,7 +54,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-mpeg4audio-save-to-disk/main.go
View File

@@ -56,7 +56,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-mpeg4audio/main.go
View File

@@ -50,7 +50,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-opus/main.go
View File

@@ -50,7 +50,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-vp8/main.go
View File

@@ -51,7 +51,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-format-vp9/main.go
View File

@@ -51,7 +51,7 @@ func main() {
}
// setup a single media
_, err = c.Setup(medi, baseURL, 0, 0)
_, err = c.Setup(baseURL, medi, 0, 0)
if err != nil {
panic(err)
}

2
examples/client-read-options/main.go
View File

@@ -47,7 +47,7 @@ func main() {
}
// setup all medias
err = c.SetupAll(medias, baseURL)
err = c.SetupAll(baseURL, medias)
if err != nil {
panic(err)
}

2
examples/client-read-pause/main.go
View File

@@ -41,7 +41,7 @@ func main() {
}
// setup all medias
err = c.SetupAll(medias, baseURL)
err = c.SetupAll(baseURL, medias)
if err != nil {
panic(err)
}

2
examples/client-read-republish/main.go
View File

@@ -40,7 +40,7 @@ func main() {
// setup all medias
// this must be called before StartRecording(), since it overrides the control attribute.
err = reader.SetupAll(medias, baseURL)
err = reader.SetupAll(baseURL, medias)
if err != nil {
panic(err)
}

2
examples/client-read/main.go
View File

@@ -38,7 +38,7 @@ func main() {
}
// setup all medias
err = c.SetupAll(medias, baseURL)
err = c.SetupAll(baseURL, medias)
if err != nil {
panic(err)
}

2
examples/proxy/client.go
View File

@@ -63,7 +63,7 @@ func (c *client) read() error {
}
// setup all medias
err = rc.SetupAll(medias, baseURL)
err = rc.SetupAll(baseURL, medias)
if err != nil {
return err
}