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

remove ID and BaseURL from Track

Browse Source
This commit is contained in:
aler9
2021-06-23 23:07:55 +02:00
parent d073a185c2
commit dde57ee568
14 changed files with 236 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
serversession.go
View File

@@ -24,7 +24,10 @@ func setupGetTrackIDPathQuery(
url *base.URL,
thMode *headers.TransportMode,
announcedTracks []ServerSessionAnnouncedTrack,
setuppedPath *string, setuppedQuery *string) (int, string, string, error) {
setuppedPath *string,
setuppedQuery *string,
setuppedBaseURL *base.URL,
) (int, string, string, error) {
pathAndQuery, ok := url.RTSPPathAndQuery()
if !ok {
return 0, "", "", liberrors.ErrServerInvalidPath{}
@@ -63,7 +66,7 @@ func setupGetTrackIDPathQuery(
}
for trackID, track := range announcedTracks {
u, _ := track.track.URL()
u, _ := track.track.URL(setuppedBaseURL)
if u.String() == url.String() {
return trackID, *setuppedPath, *setuppedQuery, nil
}
@@ -126,6 +129,7 @@ type ServerSession struct {
setuppedTracks map[int]ServerSessionSetuppedTrack
setuppedProtocol *base.StreamProtocol
setuppedDelivery *base.StreamDelivery
setuppedBaseURL *base.URL // publish
setuppedStream *ServerStream // read
setuppedPath *string
setuppedQuery *string
@@ -443,7 +447,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
}, liberrors.ErrServerContentTypeUnsupported{CT: ct}
}
tracks, err := ReadTracks(req.Body, req.URL)
tracks, err := ReadTracks(req.Body)
if err != nil {
return &base.Response{
StatusCode: base.StatusBadRequest,
@@ -457,7 +461,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
}
for _, track := range tracks {
trackURL, err := track.URL()
trackURL, err := track.URL(req.URL)
if err != nil {
return &base.Response{
StatusCode: base.StatusBadRequest,
@@ -493,6 +497,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
ss.state = ServerSessionStatePreRecord
ss.setuppedPath = &path
ss.setuppedQuery = &query
ss.setuppedBaseURL = req.URL
ss.announcedTracks = make([]ServerSessionAnnouncedTrack, len(tracks))
for trackID, track := range tracks {
@@ -530,7 +535,7 @@ func (ss *ServerSession) handleRequest(sc *ServerConn, req *base.Request) (*base
}
trackID, path, query, err := setupGetTrackIDPathQuery(req.URL, inTH.Mode,
ss.announcedTracks, ss.setuppedPath, ss.setuppedQuery)
ss.announcedTracks, ss.setuppedPath, ss.setuppedQuery, ss.setuppedBaseURL)
if err != nil {
return &base.Response{
StatusCode: base.StatusBadRequest,