diff --git a/client.go b/client.go index 1dbf6de8..68d4845a 100644 --- a/client.go +++ b/client.go @@ -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 } diff --git a/client_play_test.go b/client_play_test.go index 28de67ae..3b2b471b 100644 --- a/client_play_test.go +++ b/client_play_test.go @@ -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{ diff --git a/client_record_test.go b/client_record_test.go index 473624b0..3894ff6d 100644 --- a/client_record_test.go +++ b/client_record_test.go @@ -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 diff --git a/examples/client-read-format-g711/main.go b/examples/client-read-format-g711/main.go index d4e40600..778358ed 100644 --- a/examples/client-read-format-g711/main.go +++ b/examples/client-read-format-g711/main.go @@ -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) } diff --git a/examples/client-read-format-g722/main.go b/examples/client-read-format-g722/main.go index 0fd07716..d7ed8f93 100644 --- a/examples/client-read-format-g722/main.go +++ b/examples/client-read-format-g722/main.go @@ -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) } diff --git a/examples/client-read-format-h264-convert-to-jpeg/main.go b/examples/client-read-format-h264-convert-to-jpeg/main.go index b70b2c4e..a5663799 100644 --- a/examples/client-read-format-h264-convert-to-jpeg/main.go +++ b/examples/client-read-format-h264-convert-to-jpeg/main.go @@ -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) } diff --git a/examples/client-read-format-h264-save-to-disk/main.go b/examples/client-read-format-h264-save-to-disk/main.go index 0307a4ed..e391826c 100644 --- a/examples/client-read-format-h264-save-to-disk/main.go +++ b/examples/client-read-format-h264-save-to-disk/main.go @@ -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) } diff --git a/examples/client-read-format-h264/main.go b/examples/client-read-format-h264/main.go index a562fd2f..42833977 100644 --- a/examples/client-read-format-h264/main.go +++ b/examples/client-read-format-h264/main.go @@ -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) } diff --git a/examples/client-read-format-h265/main.go b/examples/client-read-format-h265/main.go index 6e494082..d85beedb 100644 --- a/examples/client-read-format-h265/main.go +++ b/examples/client-read-format-h265/main.go @@ -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) } diff --git a/examples/client-read-format-lpcm/main.go b/examples/client-read-format-lpcm/main.go index b1fc83a5..feb06092 100644 --- a/examples/client-read-format-lpcm/main.go +++ b/examples/client-read-format-lpcm/main.go @@ -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) } diff --git a/examples/client-read-format-mjpeg/main.go b/examples/client-read-format-mjpeg/main.go index fb8f4497..ef2da693 100644 --- a/examples/client-read-format-mjpeg/main.go +++ b/examples/client-read-format-mjpeg/main.go @@ -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) } diff --git a/examples/client-read-format-mpeg4audio-save-to-disk/main.go b/examples/client-read-format-mpeg4audio-save-to-disk/main.go index 5d9a6c8f..be56ec03 100644 --- a/examples/client-read-format-mpeg4audio-save-to-disk/main.go +++ b/examples/client-read-format-mpeg4audio-save-to-disk/main.go @@ -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) } diff --git a/examples/client-read-format-mpeg4audio/main.go b/examples/client-read-format-mpeg4audio/main.go index 6520ccaa..96b647a1 100644 --- a/examples/client-read-format-mpeg4audio/main.go +++ b/examples/client-read-format-mpeg4audio/main.go @@ -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) } diff --git a/examples/client-read-format-opus/main.go b/examples/client-read-format-opus/main.go index 350f5aa0..0e70741a 100644 --- a/examples/client-read-format-opus/main.go +++ b/examples/client-read-format-opus/main.go @@ -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) } diff --git a/examples/client-read-format-vp8/main.go b/examples/client-read-format-vp8/main.go index 8b29a5ab..551e680d 100644 --- a/examples/client-read-format-vp8/main.go +++ b/examples/client-read-format-vp8/main.go @@ -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) } diff --git a/examples/client-read-format-vp9/main.go b/examples/client-read-format-vp9/main.go index da894a3e..3e89e712 100644 --- a/examples/client-read-format-vp9/main.go +++ b/examples/client-read-format-vp9/main.go @@ -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) } diff --git a/examples/client-read-options/main.go b/examples/client-read-options/main.go index 15caaa72..172f8939 100644 --- a/examples/client-read-options/main.go +++ b/examples/client-read-options/main.go @@ -47,7 +47,7 @@ func main() { } // setup all medias - err = c.SetupAll(medias, baseURL) + err = c.SetupAll(baseURL, medias) if err != nil { panic(err) } diff --git a/examples/client-read-pause/main.go b/examples/client-read-pause/main.go index a22b41c8..78e15cc6 100644 --- a/examples/client-read-pause/main.go +++ b/examples/client-read-pause/main.go @@ -41,7 +41,7 @@ func main() { } // setup all medias - err = c.SetupAll(medias, baseURL) + err = c.SetupAll(baseURL, medias) if err != nil { panic(err) } diff --git a/examples/client-read-republish/main.go b/examples/client-read-republish/main.go index 45d3dc08..d8565339 100644 --- a/examples/client-read-republish/main.go +++ b/examples/client-read-republish/main.go @@ -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) } diff --git a/examples/client-read/main.go b/examples/client-read/main.go index bfd87ed2..0522787d 100644 --- a/examples/client-read/main.go +++ b/examples/client-read/main.go @@ -38,7 +38,7 @@ func main() { } // setup all medias - err = c.SetupAll(medias, baseURL) + err = c.SetupAll(baseURL, medias) if err != nil { panic(err) } diff --git a/examples/proxy/client.go b/examples/proxy/client.go index ea0a3938..8e205ea4 100644 --- a/examples/proxy/client.go +++ b/examples/proxy/client.go @@ -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 }