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

rename StreamProtocol and StreamDelivery into TransportProtocol and TransportDelivery

Browse Source
This commit is contained in:
aler9
2021-10-22 17:59:36 +02:00
parent 320c1b6f2c
commit 61c39f9062
14 changed files with 293 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
serversession.go
View File

@@ -76,22 +76,22 @@ func setupGetTrackIDPathQuery(
}
func setupGetTransport(th headers.Transport) (Transport, bool) {
delivery := func() base.StreamDelivery {
delivery := func() headers.TransportDelivery {
if th.Delivery != nil {
return *th.Delivery
}
return base.StreamDeliveryUnicast
return headers.TransportDeliveryUnicast
}()
switch th.Protocol {
case base.StreamProtocolUDP:
if delivery == base.StreamDeliveryUnicast {
case headers.TransportProtocolUDP:
if delivery == headers.TransportDeliveryUnicast {
return TransportUDP, true
}
return TransportUDPMulticast, true
default: // TCP
if delivery != base.StreamDeliveryUnicast {
if delivery != headers.TransportDeliveryUnicast {
return 0, false
}
return TransportTCP, true
@@ -696,15 +696,15 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
sst.udpRTPPort = inTH.ClientPorts[0]
sst.udpRTCPPort = inTH.ClientPorts[1]
th.Protocol = base.StreamProtocolUDP
de := base.StreamDeliveryUnicast
th.Protocol = headers.TransportProtocolUDP
de := headers.TransportDeliveryUnicast
th.Delivery = &de
th.ClientPorts = inTH.ClientPorts
th.ServerPorts = &[2]int{sc.s.udpRTPListener.port(), sc.s.udpRTCPListener.port()}
case TransportUDPMulticast:
th.Protocol = base.StreamProtocolUDP
de := base.StreamDeliveryMulticast
th.Protocol = headers.TransportProtocolUDP
de := headers.TransportDeliveryMulticast
th.Delivery = &de
v := uint(127)
th.TTL = &v
@@ -724,8 +724,8 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
ss.setuppedTracksByChannel[inTH.InterleavedIDs[0]] = trackID
th.Protocol = base.StreamProtocolTCP
de := base.StreamDeliveryUnicast
th.Protocol = headers.TransportProtocolTCP
de := headers.TransportDeliveryUnicast
th.Delivery = &de
th.InterleavedIDs = inTH.InterleavedIDs
}