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

client: replace OnWarning with Log (#208)

Browse Source
This commit is contained in:
Alessandro Ros
2023-03-19 18:15:33 +01:00
committed by GitHub
parent 1005b38ec5
commit d369d215c2
5 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
client.go
View File

@@ -10,6 +10,7 @@ import (
"context"
"crypto/tls"
"fmt"
"log"
"net"
"strconv"
"strings"
@@ -140,6 +141,24 @@ type clientRes struct {
err error
}
// LogLevel is a log level.
type LogLevel int
// Log levels.
const (
LogLevelDebug LogLevel = iota + 1
LogLevelInfo
LogLevelWarn
LogLevelError
)
// LogFunc is the prototype of the log function.
type LogFunc func(level LogLevel, format string, args ...interface{})
func defaultLog(level LogLevel, format string, args ...interface{}) {
log.Printf(format, args...)
}
// Client is a RTSP client.
type Client struct {
//
@@ -206,11 +225,18 @@ type Client struct {
OnRequest func(*base.Request)
// called after every response.
OnResponse func(*base.Response)
// called when there's a non-fatal warning.
// Deprecated. replaced by Log.
OnWarning func(error)
// Deprecated: replaced by OnWarning.
// Deprecated. replaced by Log.
OnDecodeError func(error)
//
// logging (all optional)
//
// function that receives log messages.
// It defaults to log.Printf.
Log LogFunc
//
// private
//
@@ -313,12 +339,19 @@ func (c *Client) Start(scheme string, host string) error {
c.OnResponse = func(*base.Response) {
}
}
if c.OnWarning == nil {
c.OnWarning = func(error) {
if c.OnDecodeError != nil {
c.Log = func(level LogLevel, format string, args ...interface{}) {
c.OnDecodeError(fmt.Errorf(format, args...))
}
}
if c.OnDecodeError != nil {
c.OnWarning = c.OnDecodeError
if c.OnWarning != nil {
c.Log = func(level LogLevel, format string, args ...interface{}) {
c.OnDecodeError(fmt.Errorf(format, args...))
}
}
if c.Log == nil {
c.Log = defaultLog
}
// private
@@ -591,7 +624,7 @@ func (c *Client) checkState(allowed map[clientState]struct{}) error {
}
func (c *Client) trySwitchingProtocol() error {
c.OnWarning(fmt.Errorf("no UDP packets received, switching to TCP"))
c.Log(LogLevelWarn, "no UDP packets received, switching to TCP")
prevScheme := c.scheme
prevHost := c.host
@@ -632,7 +665,7 @@ func (c *Client) trySwitchingProtocol() error {
}
func (c *Client) trySwitchingProtocol2(medi *media.Media, baseURL *url.URL) (*base.Response, error) {
c.OnWarning(fmt.Errorf("switching to TCP because server requested it"))
c.Log(LogLevelWarn, "switching to TCP because server requested it")
prevScheme := c.scheme
prevHost := c.host
@@ -1247,7 +1280,7 @@ func (c *Client) doSetup(
if res.StatusCode == base.StatusUnsupportedTransport &&
c.effectiveTransport == nil &&
c.Transport == nil {
c.OnWarning(fmt.Errorf("switching to TCP because server requested it"))
c.Log(LogLevelWarn, "switching to TCP because server requested it")
v := TransportTCP
c.effectiveTransport = &v
return c.doSetup(medi, baseURL, 0, 0)