Separate from ion-sfu (#171)

* Separate from ion-sfu

changes:
1. extract pkg/buffer, twcc, sfu, relay, stats, logger

2. to solve cycle import, move ion-sfu/pkg/logger to pkg/sfu/logger

3. replace pion/ion-sfu => ./
reason: will change import pion/ion-sfu/pkg/* to livekit-server/pkg/*
after this pr merged. Just not change any code in this pr, because it
will confused with the separate code from ion-sfu in review.

* Move code from ion-sfu to pkg/sfu

* fix build error for resovle conflict

Co-authored-by: cnderrauber <zengjie9004@gmail.com>
This commit is contained in:
cnderrauberandcnderrauber authored and GitHub committed 2021-11-09 12:03:16 +08:00
1 parent 289ebd32ff
commit 1e1aaeb86b
58 files changed
+12210 -384

No files matched your search

+1 -1
View File
@@ -4,8 +4,8 @@ import (
"errors"
"net"
"github.com/livekit/livekit-server/pkg/sfu/buffer"
"github.com/pion/ice/v2"
"github.com/pion/ion-sfu/pkg/buffer"
"github.com/pion/webrtc/v3"
"github.com/livekit/livekit-server/pkg/config"
+3 -3
View File
@@ -6,12 +6,12 @@ import (
"sync/atomic"
"time"
"github.com/livekit/livekit-server/pkg/sfu"
"github.com/livekit/livekit-server/pkg/sfu/buffer"
"github.com/livekit/livekit-server/pkg/sfu/twcc"
"github.com/livekit/protocol/logger"
livekit "github.com/livekit/protocol/proto"
"github.com/livekit/protocol/utils"
"github.com/pion/ion-sfu/pkg/buffer"
"github.com/pion/ion-sfu/pkg/sfu"
"github.com/pion/ion-sfu/pkg/twcc"
"github.com/pion/rtcp"
"github.com/pion/webrtc/v3"
"github.com/pion/webrtc/v3/pkg/rtcerr"
+2 -2
View File
@@ -9,11 +9,11 @@ import (
"time"
lru "github.com/hashicorp/golang-lru"
"github.com/livekit/livekit-server/pkg/sfu"
"github.com/livekit/livekit-server/pkg/sfu/twcc"
"github.com/livekit/protocol/logger"
livekit "github.com/livekit/protocol/proto"
"github.com/livekit/protocol/utils"
"github.com/pion/ion-sfu/pkg/sfu"
"github.com/pion/ion-sfu/pkg/twcc"
"github.com/pion/rtcp"
"github.com/pion/webrtc/v3"
"github.com/pkg/errors"
+1 -1
View File
@@ -14,7 +14,7 @@ type pliThrottle struct {
lastSent map[uint32]int64
}
// github.com/pion/ion-sfu/pkg/sfu/simulcast.go
// github.com/livekit/livekit-server/pkg/sfu/simulcast.go
const (
fullResolution = "f"
halfResolution = "h"
+1 -1
View File
@@ -8,9 +8,9 @@ import (
"time"
"github.com/go-logr/logr"
"github.com/livekit/livekit-server/pkg/sfu/buffer"
"github.com/livekit/protocol/logger"
livekit "github.com/livekit/protocol/proto"
"github.com/pion/ion-sfu/pkg/buffer"
"google.golang.org/protobuf/proto"
"github.com/livekit/livekit-server/pkg/config"
+1 -1
View File
@@ -4,9 +4,9 @@ import (
"time"
"github.com/bep/debounce"
"github.com/livekit/livekit-server/pkg/sfu"
livekit "github.com/livekit/protocol/proto"
"github.com/livekit/protocol/utils"
"github.com/pion/ion-sfu/pkg/sfu"
"github.com/pion/webrtc/v3"
)
+1 -1
View File
@@ -3,7 +3,7 @@ package types
import (
"time"
"github.com/pion/ion-sfu/pkg/sfu"
"github.com/livekit/livekit-server/pkg/sfu"
"github.com/pion/rtcp"
"github.com/pion/webrtc/v3"
@@ -5,8 +5,8 @@ import (
"sync"
"github.com/livekit/livekit-server/pkg/rtc/types"
"github.com/livekit/livekit-server/pkg/sfu"
livekit "github.com/livekit/protocol/proto"
"github.com/pion/ion-sfu/pkg/sfu"
)
type FakeSubscribedTrack struct {
+1 -1
View File
@@ -1,7 +1,7 @@
package rtc
import (
"github.com/pion/ion-sfu/pkg/sfu"
"github.com/livekit/livekit-server/pkg/sfu"
)
// wrapper around WebRTC receiver, overriding its ID