Skip to content

Commit

Permalink
bump pion/webrtc to v4
Browse files Browse the repository at this point in the history
  • Loading branch information
@aler9
aler9 committed Jan 13, 2025
1 parent 6774485 commit 8431b62
Show file tree
Hide file tree
Showing 20 changed files with 62 additions and 117 deletions.
25 changes: 13 additions & 12 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ require (
github.com/gorilla/websocket v1.5.3
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/matthewhartstonge/argon2 v1.1.1
github.com/pion/ice/v2 v2.3.24
github.com/pion/ice/v4 v4.0.3
github.com/pion/interceptor v0.1.37
github.com/pion/logging v0.2.2
github.com/pion/rtcp v1.2.15
github.com/pion/rtp v1.8.10
github.com/pion/sdp/v3 v3.0.10
github.com/pion/webrtc/v3 v3.2.22
github.com/pion/webrtc/v4 v4.0.7
github.com/stretchr/testify v1.10.0
golang.org/x/crypto v0.32.0
golang.org/x/sys v0.29.0
Expand Down Expand Up @@ -69,21 +69,22 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pion/datachannel v1.5.5 // indirect
github.com/pion/dtls/v2 v2.2.7 // indirect
github.com/pion/mdns v0.0.12 // indirect
github.com/pion/datachannel v1.5.10 // indirect
github.com/pion/dtls/v3 v3.0.4 // indirect
github.com/pion/mdns/v2 v2.0.7 // indirect
github.com/pion/randutil v0.1.0 // indirect
github.com/pion/sctp v1.8.16 // indirect
github.com/pion/srtp/v2 v2.0.18 // indirect
github.com/pion/stun v0.6.1 // indirect
github.com/pion/transport/v2 v2.2.4 // indirect
github.com/pion/turn/v2 v2.1.3 // indirect
github.com/pion/sctp v1.8.35 // indirect
github.com/pion/srtp/v3 v3.0.4 // indirect
github.com/pion/stun/v3 v3.0.0 // indirect
github.com/pion/transport/v3 v3.0.7 // indirect
github.com/pion/turn/v4 v4.0.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/skeema/knownhosts v1.3.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
github.com/wlynxg/anet v0.0.5 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
golang.org/x/arch v0.12.0 // indirect
Expand All @@ -100,6 +101,6 @@ require (

replace code.cloudfoundry.org/bytefmt => github.com/cloudfoundry/bytefmt v0.0.0-20211005130812-5bb3c17173e5

replace github.com/pion/ice/v2 => github.com/aler9/ice/v2 v2.0.0-20241006110309-c973995af023
replace github.com/pion/ice/v4 => github.com/aler9/ice/v4 v4.0.0-20250113220727-1c0b762897da

replace github.com/pion/webrtc/v3 => github.com/aler9/webrtc/v3 v3.0.0-20240610104456-eaec24056d06
replace github.com/pion/webrtc/v4 => github.com/aler9/webrtc/v4 v4.0.0-20250113221101-1adc4784368c
98 changes: 20 additions & 78 deletions go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/core/api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
srt "github.com/datarhei/gosrt"
"github.com/google/uuid"
"github.com/pion/rtp"
pwebrtc "github.com/pion/webrtc/v3"
pwebrtc "github.com/pion/webrtc/v4"
"github.com/stretchr/testify/require"

"github.com/bluenviron/mediamtx/internal/protocols/rtmp"
Expand Down
2 changes: 1 addition & 1 deletion internal/core/metrics_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/bluenviron/mediacommon/pkg/formats/mpegts"
srt "github.com/datarhei/gosrt"
"github.com/pion/rtp"
pwebrtc "github.com/pion/webrtc/v3"
pwebrtc "github.com/pion/webrtc/v4"
"github.com/stretchr/testify/require"

"github.com/bluenviron/mediamtx/internal/protocols/rtmp"
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/webrtc/from_stream.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/bluenviron/mediamtx/internal/logger"
"github.com/bluenviron/mediamtx/internal/stream"
"github.com/bluenviron/mediamtx/internal/unit"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/webrtc/incoming_track.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/bluenviron/gortsplib/v4/pkg/rtpreorderer"
"github.com/pion/rtcp"
"github.com/pion/rtp"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"

"github.com/bluenviron/mediamtx/internal/logger"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/webrtc/outgoing_track.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"

"github.com/pion/rtp"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"
)

var multichannelOpusSDP = map[int]string{
Expand Down
18 changes: 10 additions & 8 deletions internal/protocols/webrtc/peer_connection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"sync"
"time"

"github.com/pion/ice/v2"
"github.com/pion/ice/v4"
"github.com/pion/interceptor"
"github.com/pion/sdp/v3"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"

"github.com/bluenviron/mediamtx/internal/conf"
"github.com/bluenviron/mediamtx/internal/logger"
Expand Down Expand Up @@ -115,17 +115,19 @@ func (co *PeerConnection) Start() error {
settingsEngine.SetICEUDPMux(co.ICEUDPMux)
}

if co.LocalRandomUDP {
settingsEngine.SetLocalRandomUDP(true)
}

if co.ICETCPMux != nil {
settingsEngine.SetICETCPMux(co.ICETCPMux)
networkTypes = append(networkTypes, webrtc.NetworkTypeTCP4)
}

if co.LocalRandomUDP {
settingsEngine.SetICEUDPRandom(true)
}

settingsEngine.SetNetworkTypes(networkTypes)

settingsEngine.SetIncludeLoopbackCandidate(true)

mediaEngine := &webrtc.MediaEngine{}

if co.Publish {
Expand Down Expand Up @@ -234,15 +236,15 @@ func (co *PeerConnection) Start() error {
}
}
} else {
_, err = co.wr.AddTransceiverFromKind(webrtc.RTPCodecTypeVideo, webrtc.RtpTransceiverInit{
_, err = co.wr.AddTransceiverFromKind(webrtc.RTPCodecTypeVideo, webrtc.RTPTransceiverInit{
Direction: webrtc.RTPTransceiverDirectionRecvonly,
})
if err != nil {
co.wr.Close() //nolint:errcheck
return err
}

_, err = co.wr.AddTransceiverFromKind(webrtc.RTPCodecTypeAudio, webrtc.RtpTransceiverInit{
_, err = co.wr.AddTransceiverFromKind(webrtc.RTPCodecTypeAudio, webrtc.RTPTransceiverInit{
Direction: webrtc.RTPTransceiverDirectionRecvonly,
})
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/webrtc/peer_connection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/bluenviron/mediamtx/internal/conf"
"github.com/bluenviron/mediamtx/internal/test"
"github.com/pion/sdp/v3"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/webrtc/to_stream.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/bluenviron/gortsplib/v4/pkg/rtptime"
"github.com/bluenviron/mediamtx/internal/stream"
"github.com/pion/rtp"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"
)

var errNoSupportedCodecsTo = errors.New(
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/webrtc/to_stream_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/bluenviron/mediamtx/internal/stream"
"github.com/bluenviron/mediamtx/internal/test"
"github.com/pion/rtp"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/whip/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/pion/sdp/v3"
pwebrtc "github.com/pion/webrtc/v3"
pwebrtc "github.com/pion/webrtc/v4"

"github.com/bluenviron/mediamtx/internal/conf"
"github.com/bluenviron/mediamtx/internal/logger"
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/whip/ice_fragment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strconv"

"github.com/pion/sdp/v3"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"
)

// ICEFragmentUnmarshal decodes an ICE fragment.
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/whip/ice_fragment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package whip
import (
"testing"

"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/whip/link_header.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"regexp"

"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"
)

func quoteCredential(v string) string {
Expand Down
2 changes: 1 addition & 1 deletion internal/protocols/whip/link_header_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package whip
import (
"testing"

"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v4"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/servers/webrtc/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"time"

"github.com/google/uuid"
"github.com/pion/ice/v2"
"github.com/pion/ice/v4"
"github.com/pion/logging"
pwebrtc "github.com/pion/webrtc/v3"
pwebrtc "github.com/pion/webrtc/v4"

"github.com/bluenviron/mediamtx/internal/conf"
"github.com/bluenviron/mediamtx/internal/defs"
Expand Down
2 changes: 1 addition & 1 deletion internal/servers/webrtc/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/bluenviron/mediamtx/internal/unit"
"github.com/google/uuid"
"github.com/pion/rtp"
pwebrtc "github.com/pion/webrtc/v3"
pwebrtc "github.com/pion/webrtc/v4"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/servers/webrtc/session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (

"github.com/bluenviron/gortsplib/v4/pkg/description"
"github.com/google/uuid"
"github.com/pion/ice/v2"
"github.com/pion/ice/v4"
"github.com/pion/sdp/v3"
pwebrtc "github.com/pion/webrtc/v3"
pwebrtc "github.com/pion/webrtc/v4"

"github.com/bluenviron/mediamtx/internal/auth"
"github.com/bluenviron/mediamtx/internal/defs"
Expand Down
2 changes: 1 addition & 1 deletion internal/staticsources/webrtc/source_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/pion/rtp"
pwebrtc "github.com/pion/webrtc/v3"
pwebrtc "github.com/pion/webrtc/v4"
"github.com/stretchr/testify/require"

"github.com/bluenviron/mediamtx/internal/conf"
Expand Down

0 comments on commit 8431b62

Please sign in to comment.