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

replace OnDecodeError with OnWarning (#177)

Browse Source
This commit is contained in:
Alessandro Ros
2023-01-23 12:54:57 +01:00
committed by GitHub
parent 14fcde1c69
commit a2d6ce8af6
12 changed files with 69 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client.go
View File

@@ -207,7 +207,8 @@ type Client struct {
// called after every response.
OnResponse func(*base.Response)
// called when there's a non-fatal warning.
// TODO: rename.
OnWarning func(error)
// Deprecated: replaced by OnWarning.
OnDecodeError func(error)
//
@@ -312,10 +313,13 @@ func (c *Client) Start(scheme string, host string) error {
c.OnResponse = func(*base.Response) {
}
}
if c.OnDecodeError == nil {
c.OnDecodeError = func(error) {
if c.OnWarning == nil {
c.OnWarning = func(error) {
}
}
if c.OnDecodeError != nil {
c.OnWarning = c.OnDecodeError
}
// private
if c.senderReportPeriod == 0 {
@@ -587,7 +591,7 @@ func (c *Client) checkState(allowed map[clientState]struct{}) error {
}
func (c *Client) trySwitchingProtocol() error {
c.OnDecodeError(fmt.Errorf("no UDP packets received, switching to TCP"))
c.OnWarning(fmt.Errorf("no UDP packets received, switching to TCP"))
prevScheme := c.scheme
prevHost := c.host
@@ -628,7 +632,7 @@ func (c *Client) trySwitchingProtocol() error {
}
func (c *Client) trySwitchingProtocol2(medi *media.Media, baseURL *url.URL) (*base.Response, error) {
c.OnDecodeError(fmt.Errorf("switching to TCP due to server request"))
c.OnWarning(fmt.Errorf("switching to TCP due to server request"))
prevScheme := c.scheme
prevHost := c.host
@@ -1243,7 +1247,7 @@ func (c *Client) doSetup(
if res.StatusCode == base.StatusUnsupportedTransport &&
c.effectiveTransport == nil &&
c.Transport == nil {
c.OnDecodeError(fmt.Errorf("switching to TCP due to server request"))
c.OnWarning(fmt.Errorf("switching to TCP due to server request"))
v := TransportTCP
c.effectiveTransport = &v
return c.doSetup(medi, baseURL, 0, 0)