Bump protocol to v1.37.1 and add audio_features handling (#634)

Author: lukasIO

livekit-api/src/services/egress.rs

@@ -153,6 +153,7 @@ impl EgressClient {
                     image_outputs,
                     output: None, // Deprecated
                     await_start_signal: options.await_start_signal,
+                    ..Default::default()
                 },
                 self.base
                     .auth_header(VideoGrants { room_record: true, ..Default::default() }, None)?,
@@ -184,6 +185,7 @@ impl EgressClient {
                     stream_outputs,
                     segment_outputs,
                     image_outputs,
+                    ..Default::default()
                 },
                 self.base
                     .auth_header(VideoGrants { room_record: true, ..Default::default() }, None)?,
@@ -215,6 +217,7 @@ impl EgressClient {
                     segment_outputs,
                     image_outputs,
                     output: None, // Deprecated
+                    ..Default::default()
                 },
                 self.base
                     .auth_header(VideoGrants { room_record: true, ..Default::default() }, None)?,
@@ -244,6 +247,7 @@ impl EgressClient {
                         }
                     },
                     track_id: track_id.to_string(),
+                    ..Default::default()
                 },
                 self.base
                     .auth_header(VideoGrants { room_record: true, ..Default::default() }, None)?,

livekit-api/src/services/sip.rs

@@ -354,9 +354,7 @@ impl SIPClient {
                     hide_phone_number: options.hide_phone_number,
                     rule: Some(proto::SipDispatchRule { rule: Some(rule.to_owned()) }),
 
-                    // TODO: support these attributes
-                    room_preset: Default::default(),
-                    room_config: Default::default(),
+                    ..Default::default()
                 },
                 self.base.auth_header(
                     Default::default(),

livekit-ffi/protocol/participant.proto

@@ -70,4 +70,5 @@ enum DisconnectReason {
   USER_REJECTED = 12;
   // SIP protocol failure or unexpected response
   SIP_TRUNK_FAILURE = 13;
+  CONNECTION_TIMEOUT = 14;
 }

livekit-ffi/protocol/track.proto

@@ -89,6 +89,7 @@ message TrackPublicationInfo {
   required bool muted = 9;
   required bool remote = 10;
   required EncryptionType encryption_type = 11;
+  repeated AudioTrackFeature audio_features = 12;
 }
 
 message OwnedTrackPublication {
@@ -147,3 +148,13 @@ message ParticipantTrackPermission {
 
 message SetTrackSubscriptionPermissionsResponse {
 }
+
+enum AudioTrackFeature {
+  TF_STEREO = 0;
+  TF_NO_DTX = 1;
+  TF_AUTO_GAIN_CONTROL = 2;
+  TF_ECHO_CANCELLATION = 3;
+  TF_NOISE_SUPPRESSION = 4;
+  TF_ENHANCED_NOISE_CANCELLATION = 5;
+  TF_PRECONNECT_BUFFER = 6; // client will buffer audio once available and send it to the server via bytes stream once connected
+}

livekit-ffi/src/conversion/participant.rs

@@ -61,6 +61,7 @@ impl From<DisconnectReason> for proto::DisconnectReason {
             DisconnectReason::UserUnavailable => proto::DisconnectReason::UserUnavailable,
             DisconnectReason::UserRejected => proto::DisconnectReason::UserRejected,
             DisconnectReason::SipTrunkFailure => proto::DisconnectReason::SipTrunkFailure,
+            DisconnectReason::ConnectionTimeout => proto::DisconnectReason::ConnectionTimeout,
         }
     }
 }

livekit-ffi/src/conversion/room.rs

@@ -98,6 +98,7 @@ impl From<DisconnectReason> for proto::DisconnectReason {
             DisconnectReason::UserUnavailable => Self::UserUnavailable,
             DisconnectReason::UserRejected => Self::UserRejected,
             DisconnectReason::SipTrunkFailure => Self::SipTrunkFailure,
+            DisconnectReason::ConnectionTimeout => Self::ConnectionTimeout,
         }
     }
 }

livekit-ffi/src/conversion/track.rs

@@ -34,6 +34,11 @@ impl From<&FfiPublication> for proto::TrackPublicationInfo {
             muted: publication.is_muted(),
             remote: publication.is_remote(),
             encryption_type: proto::EncryptionType::from(publication.encryption_type()).into(),
+            audio_features: publication
+                .audio_features()
+                .into_iter()
+                .map(|i| proto::AudioTrackFeature::from(i).into())
+                .collect(),
         }
     }
 }
@@ -121,3 +126,35 @@ impl From<proto::ParticipantTrackPermission> for ParticipantTrackPermission {
         }
     }
 }
+
+impl From<proto::AudioTrackFeature> for AudioTrackFeature {
+    fn from(value: proto::AudioTrackFeature) -> Self {
+        match value {
+            proto::AudioTrackFeature::TfStereo => AudioTrackFeature::TfStereo,
+            proto::AudioTrackFeature::TfNoDtx => AudioTrackFeature::TfNoDtx,
+            proto::AudioTrackFeature::TfAutoGainControl => AudioTrackFeature::TfAutoGainControl,
+            proto::AudioTrackFeature::TfEchoCancellation => AudioTrackFeature::TfEchoCancellation,
+            proto::AudioTrackFeature::TfNoiseSuppression => AudioTrackFeature::TfNoiseSuppression,
+            proto::AudioTrackFeature::TfEnhancedNoiseCancellation => {
+                AudioTrackFeature::TfEnhancedNoiseCancellation
+            }
+            proto::AudioTrackFeature::TfPreconnectBuffer => AudioTrackFeature::TfPreconnectBuffer,
+        }
+    }
+}
+
+impl From<AudioTrackFeature> for proto::AudioTrackFeature {
+    fn from(value: AudioTrackFeature) -> Self {
+        match value {
+            AudioTrackFeature::TfStereo => proto::AudioTrackFeature::TfStereo,
+            AudioTrackFeature::TfNoDtx => proto::AudioTrackFeature::TfNoDtx,
+            AudioTrackFeature::TfAutoGainControl => proto::AudioTrackFeature::TfAutoGainControl,
+            AudioTrackFeature::TfEchoCancellation => proto::AudioTrackFeature::TfEchoCancellation,
+            AudioTrackFeature::TfNoiseSuppression => proto::AudioTrackFeature::TfNoiseSuppression,
+            AudioTrackFeature::TfEnhancedNoiseCancellation => {
+                proto::AudioTrackFeature::TfEnhancedNoiseCancellation
+            }
+            AudioTrackFeature::TfPreconnectBuffer => proto::AudioTrackFeature::TfPreconnectBuffer,
+        }
+    }
+}

livekit-ffi/src/livekit.proto.rs

@@ -1392,6 +1392,8 @@ pub struct TrackPublicationInfo {
     pub remote: bool,
     #[prost(enumeration="EncryptionType", required, tag="11")]
     pub encryption_type: i32,
+    #[prost(enumeration="AudioTrackFeature", repeated, packed="false", tag="12")]
+    pub audio_features: ::prost::alloc::vec::Vec<i32>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -1575,6 +1577,48 @@ impl StreamState {
         }
     }
 }
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum AudioTrackFeature {
+    TfStereo = 0,
+    TfNoDtx = 1,
+    TfAutoGainControl = 2,
+    TfEchoCancellation = 3,
+    TfNoiseSuppression = 4,
+    TfEnhancedNoiseCancellation = 5,
+    /// client will buffer audio once available and send it to the server via bytes stream once connected
+    TfPreconnectBuffer = 6,
+}
+impl AudioTrackFeature {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            AudioTrackFeature::TfStereo => "TF_STEREO",
+            AudioTrackFeature::TfNoDtx => "TF_NO_DTX",
+            AudioTrackFeature::TfAutoGainControl => "TF_AUTO_GAIN_CONTROL",
+            AudioTrackFeature::TfEchoCancellation => "TF_ECHO_CANCELLATION",
+            AudioTrackFeature::TfNoiseSuppression => "TF_NOISE_SUPPRESSION",
+            AudioTrackFeature::TfEnhancedNoiseCancellation => "TF_ENHANCED_NOISE_CANCELLATION",
+            AudioTrackFeature::TfPreconnectBuffer => "TF_PRECONNECT_BUFFER",
+        }
+    }
+    /// Creates an enum from field names used in the ProtoBuf definition.
+    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+        match value {
+            "TF_STEREO" => Some(Self::TfStereo),
+            "TF_NO_DTX" => Some(Self::TfNoDtx),
+            "TF_AUTO_GAIN_CONTROL" => Some(Self::TfAutoGainControl),
+            "TF_ECHO_CANCELLATION" => Some(Self::TfEchoCancellation),
+            "TF_NOISE_SUPPRESSION" => Some(Self::TfNoiseSuppression),
+            "TF_ENHANCED_NOISE_CANCELLATION" => Some(Self::TfEnhancedNoiseCancellation),
+            "TF_PRECONNECT_BUFFER" => Some(Self::TfPreconnectBuffer),
+            _ => None,
+        }
+    }
+}
 /// Enable/Disable a remote track publication
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -1694,6 +1738,7 @@ pub enum DisconnectReason {
     UserRejected = 12,
     /// SIP protocol failure or unexpected response
     SipTrunkFailure = 13,
+    ConnectionTimeout = 14,
 }
 impl DisconnectReason {
     /// String value of the enum field names used in the ProtoBuf definition.
@@ -1716,6 +1761,7 @@ impl DisconnectReason {
             DisconnectReason::UserUnavailable => "USER_UNAVAILABLE",
             DisconnectReason::UserRejected => "USER_REJECTED",
             DisconnectReason::SipTrunkFailure => "SIP_TRUNK_FAILURE",
+            DisconnectReason::ConnectionTimeout => "CONNECTION_TIMEOUT",
         }
     }
     /// Creates an enum from field names used in the ProtoBuf definition.
@@ -1735,6 +1781,7 @@ impl DisconnectReason {
             "USER_UNAVAILABLE" => Some(Self::UserUnavailable),
             "USER_REJECTED" => Some(Self::UserRejected),
             "SIP_TRUNK_FAILURE" => Some(Self::SipTrunkFailure),
+            "CONNECTION_TIMEOUT" => Some(Self::ConnectionTimeout),
             _ => None,
         }
     }