Allow setting a list of SIP codecs for SDP.

Author: dennwc

livekit/livekit_sip.pb.go

@@ -8,11 +8,11 @@ import (
 	"strconv"
 	"strings"
 
+	"golang.org/x/text/language"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
 	"github.com/livekit/protocol/utils/xtwirp"
-	"golang.org/x/text/language"
 )
 
 var (
@@ -1024,3 +1024,13 @@ var (
 		")", "",
 	)
 )
+
+// MergeEncryption optionally applies SIPMediaEncryption if it's not set on the SIPMediaConfig.
+func (m *SIPMediaConfig) MergeEncryption(v SIPMediaEncryption) {
+	if m == nil {
+		return
+	}
+	if m.Encryption == 0 {
+		m.Encryption = v
+	}
+}

livekit/livekit_sip.twirp.go

@@ -223,6 +223,19 @@ enum SIPMediaEncryption {
   SIP_MEDIA_ENCRYPT_REQUIRE = 2; // require encryption
 }
 
+message SIPCodec {
+  string name = 1;
+  uint32 rate = 2;
+}
+
+message SIPMediaConfig {
+  // if set, ignore the default codecs and use the list below.
+  bool only_listed_codecs = 1;
+  // List of allowed codecs. If only_listed_codecs is not set, this list is added to default codecs.
+  repeated SIPCodec codecs = 2;
+  SIPMediaEncryption encryption = 3;
+}
+
 message ProviderInfo {
   string id = 1;
   string name = 2;
@@ -649,13 +662,14 @@ message SIPDispatchRuleInfo {
   // RoomConfiguration to use if the participant initiates the room
   RoomConfiguration room_config = 10;
 
+  SIPMediaConfig media = 16;
   bool krisp_enabled = 11;
-  SIPMediaEncryption media_encryption = 12;
+  SIPMediaEncryption media_encryption = 12 [deprecated=true];
 
   google.protobuf.Timestamp created_at = 14;
   google.protobuf.Timestamp updated_at = 15;
 
-  // NEXT ID: 16
+  // NEXT ID: 17
 }
 
 message SIPDispatchRuleUpdate {
@@ -670,7 +684,8 @@ message SIPDispatchRuleUpdate {
     (logger.redact) = true,
     (logger.redact_format) = "<redacted ({{ .Size }} bytes)>"
   ];
-  optional SIPMediaEncryption media_encryption = 6;
+  optional SIPMediaEncryption media_encryption = 6 [deprecated=true];
+  SIPMediaConfig media = 7;
 }
 
 // ListSIPDispatchRuleRequest lists dispatch rules for given filters. If no filters are set, all rules are listed.
@@ -788,7 +803,8 @@ message CreateSIPParticipantRequest {
   // Enable voice isolation for the callee.
   bool krisp_enabled = 14;
 
-  SIPMediaEncryption media_encryption = 18;
+  SIPMediaEncryption media_encryption = 18 [deprecated = true];
+  SIPMediaConfig media = 23;
 
   // Wait for the answer for the call before returning.
   bool wait_until_answered = 19;
@@ -804,7 +820,7 @@ message CreateSIPParticipantRequest {
     (logger.redact_format) = "<redacted ({{ .Size }} bytes)>"
   ];
   optional Destination destination = 22;
-  // NEXT ID: 23
+  // NEXT ID: 24
 }
 
 message SIPParticipantInfo {

livekit/sip.go

@@ -236,11 +236,12 @@ message EvaluateSIPDispatchRulesResponse {
   string room_preset = 20;
   livekit.RoomConfiguration room_config = 21;
 
-  livekit.SIPMediaEncryption media_encryption = 22;
+  livekit.SIPMediaEncryption media_encryption = 22 [deprecated = true];
+  livekit.SIPMediaConfig media = 24;
 
   map<string, string> feature_flags = 23;
 
-  // NEXT ID: 24
+  // NEXT ID: 25
 }
 
 message UpdateSIPCallStateRequest {

protobufs/livekit_sip.proto

@@ -121,7 +121,8 @@ message InternalCreateSIPParticipantRequest {
   // Max call duration.
   google.protobuf.Duration max_call_duration = 24;
 
-  livekit.SIPMediaEncryption media_encryption = 28;
+  livekit.SIPMediaEncryption media_encryption = 28 [deprecated = true];
+  livekit.SIPMediaConfig media = 34;
 
   // Wait for the answer for the call before returning.
   bool wait_until_answered = 29;
@@ -143,7 +144,7 @@ message InternalCreateSIPParticipantRequest {
   // Project-level feature flags from ProjectSettings.FeatureFlags
   map<string, string> feature_flags = 33;
 
-  // NEXT ID: 34
+  // NEXT ID: 35
 }
 
 message InternalCreateSIPParticipantResponse {