Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/service/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,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(_ []livekit.SIPFeature, _ map[string]string) msdk.PCM16Processor {
func (s *Service) GetMediaProcessor(_ []livekit.SIPFeature, _ map[string]string, _ string) msdk.PCM16Processor {
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/sip/inbound.go
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ func (c *inboundCall) runMediaConn(tid traceid.ID, offerData []byte, enc livekit
c.mon.SDPSize(len(answerData), false)
c.log().Debugw("SDP answer", "sdp", string(answerData))

mconf.Processor = c.s.handler.GetMediaProcessor(features, featureFlags)
mconf.Processor = c.s.handler.GetMediaProcessor(features, featureFlags, c.call.LkCallId)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hechen-eng , c.cc.ID is the source of the call ID. Please include this in some follow-up PR (doesn't need to be dedicated to this)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

um.. sorry for missing the inbound. Addressing it in #643

if err = c.media.SetConfig(mconf); err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/sip/outbound.go
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ func (c *outboundCall) sipSignal(ctx context.Context, tid traceid.ID) error {
if err != nil {
return err
}
mc.Processor = c.c.handler.GetMediaProcessor(c.sipConf.enabledFeatures, c.sipConf.featureFlags)
mc.Processor = c.c.handler.GetMediaProcessor(c.sipConf.enabledFeatures, c.sipConf.featureFlags, c.state.callInfo.CallId)
if err = c.media.SetConfig(mc); err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/sip/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ type CallIdentifier struct {
type Handler interface {
GetAuthCredentials(ctx context.Context, call *rpc.SIPCall) (AuthInfo, error)
DispatchCall(ctx context.Context, info *CallInfo) CallDispatch
GetMediaProcessor(features []livekit.SIPFeature, featureFlags map[string]string) msdk.PCM16Processor
GetMediaProcessor(features []livekit.SIPFeature, featureFlags map[string]string, callID string) msdk.PCM16Processor

RegisterTransferSIPParticipantTopic(sipCallId string) error
DeregisterTransferSIPParticipantTopic(sipCallId string)
Expand Down
2 changes: 1 addition & 1 deletion pkg/sip/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func (h TestHandler) DispatchCall(ctx context.Context, info *CallInfo) CallDispa
}
}

func (h TestHandler) GetMediaProcessor(_ []livekit.SIPFeature, _ map[string]string) msdk.PCM16Processor {
func (h TestHandler) GetMediaProcessor(_ []livekit.SIPFeature, _ map[string]string, _ string) msdk.PCM16Processor {
return nil
}

Expand Down
Loading