Skip to content

Commit 9e073cd

Browse files
dependabot[bot]dependabot[bot]
authored
build(deps): bump github.com/bluenviron/gortsplib/v4 (#4850)
Bumps [github.com/bluenviron/gortsplib/v4](https://github.com/bluenviron/gortsplib) from 4.16.0 to 4.16.1. - [Commits](bluenviron/gortsplib@v4.16.0...v4.16.1) --- updated-dependencies: - dependency-name: github.com/bluenviron/gortsplib/v4 dependency-version: 4.16.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 19a47ac commit 9e073cd

File tree

3 files changed

+19
-24
lines changed

3 files changed

+19
-24
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ require (
1010
github.com/alecthomas/kong v1.12.1
1111
github.com/asticode/go-astits v1.13.0
1212
github.com/bluenviron/gohlslib/v2 v2.2.2
13-
github.com/bluenviron/gortsplib/v4 v4.16.0
14-
github.com/bluenviron/mediacommon/v2 v2.4.0
13+
github.com/bluenviron/gortsplib/v4 v4.16.1
14+
github.com/bluenviron/mediacommon/v2 v2.4.1
1515
github.com/datarhei/gosrt v0.9.0
1616
github.com/fsnotify/fsnotify v1.9.0
1717
github.com/gin-contrib/pprof v1.5.3
@@ -87,7 +87,7 @@ require (
8787
github.com/xanzy/ssh-agent v0.3.3 // indirect
8888
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
8989
golang.org/x/arch v0.16.0 // indirect
90-
golang.org/x/net v0.42.0 // indirect
90+
golang.org/x/net v0.43.0 // indirect
9191
golang.org/x/text v0.28.0 // indirect
9292
golang.org/x/time v0.9.0 // indirect
9393
google.golang.org/protobuf v1.36.6 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c h1:8XZeJrs4+ZYh
3535
github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c/go.mod h1:x1vxHcL/9AVzuk5HOloOEPrtJY0MaalYr78afXZ+pWI=
3636
github.com/bluenviron/gohlslib/v2 v2.2.2 h1:Q86VloPjwONKF8pu6jSEh9ENm4UzdMl5SzYvtjneL5k=
3737
github.com/bluenviron/gohlslib/v2 v2.2.2/go.mod h1:3Lby/VMDD/cN0B3uJPd3bEEiJZ34LqXs71FEvN/fq2k=
38-
github.com/bluenviron/gortsplib/v4 v4.16.0 h1:qzJxlZXCv11oxNkNTAFMaeX0uEXJE0L6lDv3CKUYT/k=
39-
github.com/bluenviron/gortsplib/v4 v4.16.0/go.mod h1:pcSNf/GToNEwdWy74moR4Tp5JWIEDJ0d9CzCSUPkiwM=
40-
github.com/bluenviron/mediacommon/v2 v2.4.0 h1:Ss1T7AMxTrICJ+a/N5urS/1lp1ZpsF+3iJq3B/RLDMw=
41-
github.com/bluenviron/mediacommon/v2 v2.4.0/go.mod h1:a6MbPmXtYda9mKibKVMZlW20GYLLrX2R7ZkUE+1pwV0=
38+
github.com/bluenviron/gortsplib/v4 v4.16.1 h1:1uqWp+0we2OKp/fWaWXhBSpqdhEtZSk7g96nAA3iayk=
39+
github.com/bluenviron/gortsplib/v4 v4.16.1/go.mod h1:Vm07yUMys9XKnuZJLfTT8zluAN2n9ZOtz40Xb8RKh+8=
40+
github.com/bluenviron/mediacommon/v2 v2.4.1 h1:PsKrO/c7hDjXxiOGRUBsYtMGNb4lKWIFea6zcOchoVs=
41+
github.com/bluenviron/mediacommon/v2 v2.4.1/go.mod h1:a6MbPmXtYda9mKibKVMZlW20GYLLrX2R7ZkUE+1pwV0=
4242
github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
4343
github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
4444
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
@@ -228,8 +228,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
228228
golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
229229
golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
230230
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
231-
golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
232-
golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
231+
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
232+
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
233233
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
234234
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
235235
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

‎internal/protocols/webrtc/incoming_track.go‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"time"
66

77
"github.com/bluenviron/gortsplib/v4/pkg/rtcpreceiver"
8-
"github.com/bluenviron/gortsplib/v4/pkg/rtpreorderer"
98
"github.com/pion/rtcp"
109
"github.com/pion/rtp"
1110
"github.com/pion/webrtc/v4"
@@ -287,8 +286,9 @@ func (t *IncomingTrack) start() {
287286
t.packetsLost.Start()
288287

289288
t.rtcpReceiver = &rtcpreceiver.RTCPReceiver{
290-
ClockRate: int(t.track.SSRC()),
291-
Period: 1 * time.Second,
289+
ClockRate: int(t.track.SSRC()),
290+
UnrealiableTransport: true,
291+
Period: 1 * time.Second,
292292
WritePacketRTCP: func(p rtcp.Packet) {
293293
t.writeRTCP([]rtcp.Packet{p}) //nolint:errcheck
294294
},
@@ -342,30 +342,25 @@ func (t *IncomingTrack) start() {
342342

343343
// read incoming RTP packets.
344344
go func() {
345-
reorderer := &rtpreorderer.Reorderer{}
346-
reorderer.Initialize()
347-
348345
for {
349346
pkt, _, err2 := t.track.ReadRTP()
350347
if err2 != nil {
351348
return
352349
}
353350

354-
packets, lost := reorderer.Process(pkt)
351+
packets, lost, err2 := t.rtcpReceiver.ProcessPacket2(pkt, time.Now(), true)
352+
if err2 != nil {
353+
t.log.Log(logger.Warn, err2.Error())
354+
continue
355+
}
355356
if lost != 0 {
356-
atomic.AddUint64(t.rtpPacketsLost, uint64(lost))
357-
t.packetsLost.Add(uint64(lost))
357+
atomic.AddUint64(t.rtpPacketsLost, lost)
358+
t.packetsLost.Add(lost)
358359
// do not return
359360
}
360361

361362
atomic.AddUint64(t.rtpPacketsReceived, uint64(len(packets)))
362363

363-
err2 = t.rtcpReceiver.ProcessPacket(pkt, time.Now(), true)
364-
if err2 != nil {
365-
t.log.Log(logger.Warn, err2.Error())
366-
continue
367-
}
368-
369364
var ntp time.Time
370365
if t.useAbsoluteTimestamp {
371366
var avail bool

0 commit comments

Comments
 (0)