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

remove redundant code (#843)

Browse Source
This commit is contained in:
Alessandro Ros
2025-08-02 14:25:17 +02:00
committed by GitHub
parent c7da004e03
commit 572dedc400
4 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client_format.go
View File

@@ -131,17 +131,9 @@ func (cf *clientFormat) remoteSSRC() (uint32, bool) {
return 0, false
}
func (cf *clientFormat) readPacketRTPUDP(pkt *rtp.Packet) {
func (cf *clientFormat) readPacketRTP(pkt *rtp.Packet) {
now := cf.cm.c.timeNow()
cf.handlePacketRTP(pkt, now)
}
func (cf *clientFormat) readPacketRTPTCP(pkt *rtp.Packet) {
now := cf.cm.c.timeNow()
cf.handlePacketRTP(pkt, now)
}
func (cf *clientFormat) handlePacketRTP(pkt *rtp.Packet, now time.Time) {
pkts, lost, err := cf.rtcpReceiver.ProcessPacket2(pkt, now, cf.format.PTSEqualsDTS(pkt))
if err != nil {
cf.cm.onPacketRTPDecodeError(err)

4
client_media.go
View File

@@ -281,7 +281,7 @@ func (cm *clientMedia) readPacketRTPTCPPlay(payload []byte) bool {
return false
}
forma.readPacketRTPTCP(pkt)
forma.readPacketRTP(pkt)
return true
}
@@ -366,7 +366,7 @@ func (cm *clientMedia) readPacketRTPUDPPlay(payload []byte) bool {
return false
}
forma.readPacketRTPUDP(pkt)
forma.readPacketRTP(pkt)
return true
}

11
server_session_format.go
View File

@@ -116,16 +116,7 @@ func (sf *serverSessionFormat) remoteSSRC() (uint32, bool) {
return 0, false
}
func (sf *serverSessionFormat) readPacketRTPUDP(pkt *rtp.Packet, now time.Time) {
sf.handlePacketRTP(pkt, now)
}
func (sf *serverSessionFormat) readPacketRTPTCP(pkt *rtp.Packet) {
now := sf.sm.ss.s.timeNow()
sf.handlePacketRTP(pkt, now)
}
func (sf *serverSessionFormat) handlePacketRTP(pkt *rtp.Packet, now time.Time) {
func (sf *serverSessionFormat) readPacketRTP(pkt *rtp.Packet, now time.Time) {
pkts, lost, err := sf.rtcpReceiver.ProcessPacket2(pkt, now, sf.format.PTSEqualsDTS(pkt))
if err != nil {
sf.sm.onPacketRTPDecodeError(err)

10
server_session_media.go
View File

@@ -235,9 +235,7 @@ func (sm *serverSessionMedia) readPacketRTPUDPPlay(payload []byte) bool {
return false
}
now := sm.ss.s.timeNow()
forma.readPacketRTPUDP(pkt, now)
forma.readPacketRTP(pkt, sm.ss.s.timeNow())
return true
}
@@ -291,7 +289,7 @@ func (sm *serverSessionMedia) readPacketRTPUDPRecord(payload []byte) bool {
now := sm.ss.s.timeNow()
atomic.StoreInt64(sm.ss.udpLastPacketTime, now.Unix())
forma.readPacketRTPUDP(pkt, now)
forma.readPacketRTP(pkt, now)
return true
}
@@ -348,7 +346,7 @@ func (sm *serverSessionMedia) readPacketRTPTCPPlay(payload []byte) bool {
return false
}
forma.readPacketRTPTCP(pkt)
forma.readPacketRTP(pkt, sm.ss.s.timeNow())
return true
}
@@ -391,7 +389,7 @@ func (sm *serverSessionMedia) readPacketRTPTCPRecord(payload []byte) bool {
return false
}
forma.readPacketRTPTCP(pkt)
forma.readPacketRTP(pkt, sm.ss.s.timeNow())
return true
}