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

move automatic protocol selection into Setup()

Browse Source
This commit is contained in:
aler9
2020-11-29 13:05:33 +01:00
parent daebb85421
commit 6db4c3b85d
4 changed files with 36 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
dialer.go
View File

@@ -139,29 +139,11 @@ func (d Dialer) DialRead(address string) (*ConnClient, error) {
return nil, err
}
proto := func() StreamProtocol {
if d.StreamProtocol != nil {
return *d.StreamProtocol
}
return StreamProtocolUDP
}()
for i, track := range tracks {
res, err := conn.Setup(u, headers.TransportModePlay, proto, track, 0, 0)
for _, track := range tracks {
_, err := conn.Setup(u, headers.TransportModePlay, track, 0, 0)
if err != nil {
// switch protocol automatically
if i == 0 && d.StreamProtocol == nil && res != nil &&
res.StatusCode == base.StatusUnsupportedTransport {
proto = StreamProtocolTCP
_, err := conn.Setup(u, headers.TransportModePlay, proto, track, 0, 0)
if err != nil {
conn.Close()
return nil, err
}
} else {
conn.Close()
return nil, err
}
conn.Close()
return nil, err
}
}
@@ -202,29 +184,11 @@ func (d Dialer) DialPublish(address string, tracks Tracks) (*ConnClient, error)
return nil, err
}
proto := func() StreamProtocol {
if d.StreamProtocol != nil {
return *d.StreamProtocol
}
return StreamProtocolUDP
}()
for i, track := range tracks {
res, err := conn.Setup(u, headers.TransportModeRecord, proto, track, 0, 0)
for _, track := range tracks {
_, err := conn.Setup(u, headers.TransportModeRecord, track, 0, 0)
if err != nil {
// switch protocol automatically
if i == 0 && d.StreamProtocol == nil && res != nil &&
res.StatusCode == base.StatusUnsupportedTransport {
proto = StreamProtocolTCP
_, err := conn.Setup(u, headers.TransportModePlay, proto, track, 0, 0)
if err != nil {
conn.Close()
return nil, err
}
} else {
conn.Close()
return nil, err
}
conn.Close()
return nil, err
}
}