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

rename tracksByChannel into tcpTracksByChannel

Browse Source
This commit is contained in:
aler9
2022-04-08 11:21:41 +02:00
parent ccecbf56be
commit e292718307
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client.go
View File

@@ -213,7 +213,7 @@ type Client struct {
streamBaseURL *base.URL streamBaseURL *base.URL
effectiveTransport *Transport effectiveTransport *Transport
tracks []*clientTrack tracks []*clientTrack
tracksByChannel map[int]int tcpTracksByChannel map[int]int
lastRange *headers.Range lastRange *headers.Range
writeMutex sync.RWMutex // publish writeMutex sync.RWMutex // publish
writeFrameAllowed bool // publish writeFrameAllowed bool // publish
@@ -580,7 +580,7 @@ func (c *Client) reset() {
c.streamBaseURL = nil c.streamBaseURL = nil
c.effectiveTransport = nil c.effectiveTransport = nil
c.tracks = nil c.tracks = nil
c.tracksByChannel = nil c.tcpTracksByChannel = nil
} }
func (c *Client) checkState(allowed map[clientState]struct{}) error { func (c *Client) checkState(allowed map[clientState]struct{}) error {
@@ -807,7 +807,7 @@ func (c *Client) runReader() {
isRTP = false isRTP = false
} }
trackID, ok := c.tracksByChannel[channel] trackID, ok := c.tcpTracksByChannel[channel]
if !ok { if !ok {
continue continue
} }
@@ -1462,7 +1462,7 @@ func (c *Client) doSetup(
return nil, liberrors.ErrClientTransportHeaderInvalidInterleavedIDs{} return nil, liberrors.ErrClientTransportHeaderInvalidInterleavedIDs{}
} }
if _, ok := c.tracksByChannel[thRes.InterleavedIDs[0]]; ok { if _, ok := c.tcpTracksByChannel[thRes.InterleavedIDs[0]]; ok {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,
}, liberrors.ErrClientTransportHeaderInterleavedIDsAlreadyUsed{} }, liberrors.ErrClientTransportHeaderInterleavedIDsAlreadyUsed{}
@@ -1542,11 +1542,11 @@ func (c *Client) doSetup(
} }
case TransportTCP: case TransportTCP:
if c.tracksByChannel == nil { if c.tcpTracksByChannel == nil {
c.tracksByChannel = make(map[int]int) c.tcpTracksByChannel = make(map[int]int)
} }
c.tracksByChannel[thRes.InterleavedIDs[0]] = trackID c.tcpTracksByChannel[thRes.InterleavedIDs[0]] = trackID
cct.tcpChannel = thRes.InterleavedIDs[0] cct.tcpChannel = thRes.InterleavedIDs[0]
} }