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

use random UUIDs as media IDs (#163)

Browse Source 
* remove Medias.Clone(), Media.Clone(), Format.Clone()

* server: use random UUIDs as media IDs

* client: use random UUIDs as media IDs
This commit is contained in:
Alessandro Ros
2022-12-22 20:32:28 +01:00
committed by GitHub
parent cabfcd627b
commit ae9dac0ad3
43 changed files with 532 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
serverstream.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/aler9/gortsplib/v2/pkg/headers"
"github.com/aler9/gortsplib/v2/pkg/liberrors"
"github.com/aler9/gortsplib/v2/pkg/media"
"github.com/aler9/gortsplib/v2/pkg/rtcpsender"
)
// ServerStream represents a data stream.
@@ -39,27 +38,8 @@ func NewServerStream(medias media.Medias) *ServerStream {
}
st.streamMedias = make(map[*media.Media]*serverStreamMedia, len(medias))
for _, media := range medias {
ssm := newServerStreamMedia(media)
ssm.formats = make(map[uint8]*serverStreamFormat)
for _, forma := range media.Formats {
tr := &serverStreamFormat{
format: forma,
}
cmedia := media
tr.rtcpSender = rtcpsender.New(
forma.ClockRate(),
func(pkt rtcp.Packet) {
st.WritePacketRTCP(cmedia, pkt)
},
)
ssm.formats[forma.PayloadType()] = tr
}
st.streamMedias[media] = ssm
for _, medi := range medias {
st.streamMedias[medi] = newServerStreamMedia(st, medi)
}
return st
@@ -242,8 +222,8 @@ func (st *ServerStream) readerSetActive(ss *ServerSession) {
}
if *ss.setuppedTransport == TransportUDPMulticast {
for mediaID, sm := range ss.setuppedMedias {
streamMedia := st.streamMedias[mediaID]
for medi, sm := range ss.setuppedMedias {
streamMedia := st.streamMedias[medi]
streamMedia.multicastHandler.rtcpl.addClient(
ss.author.ip(), streamMedia.multicastHandler.rtcpl.port(), sm)
}
@@ -261,8 +241,8 @@ func (st *ServerStream) readerSetInactive(ss *ServerSession) {
}
if *ss.setuppedTransport == TransportUDPMulticast {
for mediaID, sm := range ss.setuppedMedias {
streamMedia := st.streamMedias[mediaID]
for medi, sm := range ss.setuppedMedias {
streamMedia := st.streamMedias[medi]
streamMedia.multicastHandler.rtcpl.removeClient(sm)
}
} else {