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

convert Tracks into Medias and Formats (#155)

Browse Source 
* split tracks from medias

* move tracks into dedicated package

* move media into dedicated package

* edit Medias.Marshal() in order to return SDP

* add medias.Find() and simplify examples

* improve coverage

* fix rebase errors

* replace TrackIDs with MediaIDs

* implement media-specific and track-specific callbacks for reading RTCP and RTP packets

* rename publish into record, read into play

* add v2 tag

* rename tracks into formats
This commit is contained in:
Alessandro Ros
2022-12-11 22:03:22 +01:00
committed by GitHub
parent 2a5b3e3ee5
commit a1396206b5
177 changed files with 6872 additions and 7333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server.go
View File

@@ -10,8 +10,8 @@ import (
"sync"
"time"
"github.com/aler9/gortsplib/pkg/base"
"github.com/aler9/gortsplib/pkg/liberrors"
"github.com/aler9/gortsplib/v2/pkg/base"
"github.com/aler9/gortsplib/v2/pkg/liberrors"
)
func extractPort(address string) (int, error) {
@@ -132,22 +132,21 @@ type Server struct {
//
udpReceiverReportPeriod time.Duration
udpSenderReportPeriod time.Duration
senderReportPeriod time.Duration
sessionTimeout time.Duration
checkStreamPeriod time.Duration
ctx context.Context
ctxCancel func()
wg sync.WaitGroup
multicastNet *net.IPNet
multicastNextIP net.IP
tcpListener net.Listener
udpRTPListener *serverUDPListener
udpRTCPListener *serverUDPListener
udpRTPPacketBuffer *rtpPacketMultiBuffer
sessions map[string]*ServerSession
conns map[*ServerConn]struct{}
closeError error
ctx context.Context
ctxCancel func()
wg sync.WaitGroup
multicastNet *net.IPNet
multicastNextIP net.IP
tcpListener net.Listener
udpRTPListener *serverUDPListener
udpRTCPListener *serverUDPListener
sessions map[string]*ServerSession
conns map[*ServerConn]struct{}
closeError error
// in
connClose chan *ServerConn
@@ -187,8 +186,8 @@ func (s *Server) Start() error {
if s.udpReceiverReportPeriod == 0 {
s.udpReceiverReportPeriod = 10 * time.Second
}
if s.udpSenderReportPeriod == 0 {
s.udpSenderReportPeriod = 10 * time.Second
if s.senderReportPeriod == 0 {
s.senderReportPeriod = 10 * time.Second
}
if s.sessionTimeout == 0 {
s.sessionTimeout = 1 * 60 * time.Second
@@ -243,8 +242,6 @@ func (s *Server) Start() error {
s.udpRTPListener.close()
return err
}
s.udpRTPPacketBuffer = newRTPPacketMultiBuffer(uint64(s.ReadBufferCount))
}
if s.MulticastIPRange != "" && (s.MulticastRTPPort == 0 || s.MulticastRTCPPort == 0) ||
@@ -293,7 +290,6 @@ func (s *Server) Start() error {
}
s.multicastNextIP = s.multicastNet.IP
s.udpRTPPacketBuffer = newRTPPacketMultiBuffer(uint64(s.ReadBufferCount))
}
var err error