gilles/go2rtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code refactoring

Browse Source
This commit is contained in:
Alexey Khit
2022-12-05 00:20:36 +03:00
parent a746b96adc
commit 7057b4846f
7 changed files with 43 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/webrtc/candidates.go
+5 -6
View File
@@ -2,7 +2,6 @@ package webrtc
import (
"github.com/AlexxIT/go2rtc/cmd/api"
"github.com/AlexxIT/go2rtc/pkg/streamer"
"github.com/AlexxIT/go2rtc/pkg/webrtc"
"github.com/pion/sdp/v3"
)
@@ -13,7 +12,7 @@ func AddCandidate(address string) {
candidates = append(candidates, address)
}
func asyncCandidates(ctx *api.Transport) {
func asyncCandidates(tr *api.Transport) {
for _, address := range candidates {
address, err := webrtc.LookupIP(address)
if err != nil {
@@ -29,7 +28,7 @@ func asyncCandidates(ctx *api.Transport) {
log.Trace().Str("candidate", cand).Msg("[webrtc] config")
ctx.Write(&streamer.Message{Type: "webrtc/candidate", Value: cand})
tr.Write(&api.Message{Type: "webrtc/candidate", Value: cand})
}
}
@@ -79,11 +78,11 @@ func syncCanditates(answer string) (string, error) {
return string(data), nil
}
func candidateHandler(ctx *api.Transport, msg *streamer.Message) {
if ctx.Consumer == nil {
func candidateHandler(tr *api.Transport, msg *api.Message) {
if tr.Consumer == nil {
return
}
if conn := ctx.Consumer.(*webrtc.Conn); conn != nil {
if conn := tr.Consumer.(*webrtc.Conn); conn != nil {
s := msg.Value.(string)
log.Trace().Str("candidate", s).Msg("[webrtc] remote")
conn.AddCandidate(s)
cmd/webrtc/webrtc.go
+3 -4
View File
@@ -4,7 +4,6 @@ import (
"github.com/AlexxIT/go2rtc/cmd/api"
"github.com/AlexxIT/go2rtc/cmd/app"
"github.com/AlexxIT/go2rtc/cmd/streams"
"github.com/AlexxIT/go2rtc/pkg/streamer"
"github.com/AlexxIT/go2rtc/pkg/webrtc"
pion "github.com/pion/webrtc/v3"
"github.com/rs/zerolog"
@@ -66,7 +65,7 @@ var log zerolog.Logger
var NewPConn func() (*pion.PeerConnection, error)
func asyncHandler(tr *api.Transport, msg *streamer.Message) {
func asyncHandler(tr *api.Transport, msg *api.Message) {
src := tr.Request.URL.Query().Get("src")
stream := streams.Get(src)
if stream == nil {
@@ -96,7 +95,7 @@ func asyncHandler(tr *api.Transport, msg *streamer.Message) {
if msg != nil {
s := msg.ToJSON().Candidate
log.Trace().Str("candidate", s).Msg("[webrtc] local")
tr.Write(&streamer.Message{Type: "webrtc/candidate", Value: s})
tr.Write(&api.Message{Type: "webrtc/candidate", Value: s})
}
}
})
@@ -133,7 +132,7 @@ func asyncHandler(tr *api.Transport, msg *streamer.Message) {
tr.Consumer = conn
tr.Write(&streamer.Message{Type: "webrtc/answer", Value: answer})
tr.Write(&api.Message{Type: "webrtc/answer", Value: answer})
asyncCandidates(tr)
}