compile failure

livekit · Dec 5, 2024 · 26f8e53 · 26f8e53
1 parent 62cc0c5
commit 26f8e53
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/pkg/service/service.go b/pkg/service/service.go
@@ -27,6 +27,7 @@ import (
 	"github.com/frostbyte73/core"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
+	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/logger"
 	"github.com/livekit/protocol/rpc"
 	"github.com/livekit/psrpc"
@@ -178,7 +179,7 @@ func (s *Service) DispatchCall(ctx context.Context, info *sip.CallInfo) sip.Call
 	return DispatchCall(ctx, s.psrpcClient, s.log, info)
 }
 
-func (s *Service) GetMediaProcessor(_ []rpc.SIPFeature) media.PCM16Processor {
+func (s *Service) GetMediaProcessor(_ []livekit.SIPFeature) media.PCM16Processor {
 	return nil
 }
 

diff --git a/pkg/sip/inbound.go b/pkg/sip/inbound.go
@@ -518,7 +518,7 @@ func (c *inboundCall) handleInvite(ctx context.Context, req *sip.Request, trunkI
 	}
 }
 
-func (c *inboundCall) runMediaConn(offerData []byte, conf *config.Config, features []rpc.SIPFeature) (answerData []byte, _ error) {
+func (c *inboundCall) runMediaConn(offerData []byte, conf *config.Config, features []livekit.SIPFeature) (answerData []byte, _ error) {
 	c.mon.SDPSize(len(offerData), true)
 	c.log.Debugw("SDP offer", "sdp", string(offerData))
 

diff --git a/pkg/sip/outbound.go b/pkg/sip/outbound.go
@@ -56,7 +56,7 @@ type sipOutboundConfig struct {
 	headersToAttrs  map[string]string
 	ringingTimeout  time.Duration
 	maxCallDuration time.Duration
-	enabledFeatures []rpc.SIPFeature
+	enabledFeatures []livekit.SIPFeature
 }
 
 type outboundCall struct {

diff --git a/pkg/sip/server.go b/pkg/sip/server.go
@@ -30,8 +30,8 @@ import (
 	"github.com/icholy/digest"
 	"golang.org/x/exp/maps"
 
+	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/logger"
-	"github.com/livekit/protocol/rpc"
 	"github.com/livekit/sipgo"
 	"github.com/livekit/sipgo/sip"
 
@@ -94,15 +94,15 @@ type CallDispatch struct {
 	DispatchRuleID      string
 	Headers             map[string]string
 	HeadersToAttributes map[string]string
-	EnabledFeatures     []rpc.SIPFeature
+	EnabledFeatures     []livekit.SIPFeature
 	RingingTimeout      time.Duration
 	MaxCallDuration     time.Duration
 }
 
 type Handler interface {
 	GetAuthCredentials(ctx context.Context, callID, fromUser, toUser, toHost string, srcAddress netip.Addr) (AuthInfo, error)
 	DispatchCall(ctx context.Context, info *CallInfo) CallDispatch
-	GetMediaProcessor(features []rpc.SIPFeature) media.PCM16Processor
+	GetMediaProcessor(features []livekit.SIPFeature) media.PCM16Processor
 
 	RegisterTransferSIPParticipantTopic(sipCallId string) error
 	DeregisterTransferSIPParticipantTopic(sipCallId string)

diff --git a/pkg/sip/service_test.go b/pkg/sip/service_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/livekit/mediatransportutil/pkg/rtcconfig"
+	"github.com/livekit/protocol/livekit"
 	"github.com/livekit/protocol/logger"
 	"github.com/livekit/protocol/rpc"
 	"github.com/livekit/sipgo"
@@ -65,7 +66,7 @@ func (h TestHandler) DispatchCall(ctx context.Context, info *CallInfo) CallDispa
 	return h.DispatchCallFunc(ctx, info)
 }
 
-func (h TestHandler) GetMediaProcessor(_ []rpc.SIPFeature) media.PCM16Processor {
+func (h TestHandler) GetMediaProcessor(_ []livekit.SIPFeature) media.PCM16Processor {
 	return nil
 }