From e2c3690f1e34d8f327aae6983da38b40c7d596c3 Mon Sep 17 00:00:00 2001
From: Jacob Gelman <3182119+ladvoc@users.noreply.github.com>
Date: Thu, 13 Aug 2026 09:51:11 -0700
Subject: [PATCH 1/2] Update validation logic

---
 livekit-datatrack/src/schema.rs | 49 ++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/livekit-datatrack/src/schema.rs b/livekit-datatrack/src/schema.rs
index 075b708e5..816176872 100644
--- a/livekit-datatrack/src/schema.rs
+++ b/livekit-datatrack/src/schema.rs
@@ -114,6 +114,8 @@ pub enum DataTrackSchemaEncoding {
     JsonSchema,
 
     /// Another well-known encoding not known to this client version.
+    ///
+    /// Only produced for received tracks; cannot be used when publishing.
     Other,
     /// An application-specific encoding identified by the contained string.
     ///
@@ -163,6 +165,8 @@ pub enum DataTrackFrameEncoding {
     Json,
 
     /// Another well-known encoding not known to this client version.
+    ///
+    /// Only produced for received tracks; cannot be used when publishing.
     Other,
     /// An application-specific encoding identified by the contained string.
     ///
@@ -186,6 +190,11 @@ pub enum DataTrackSchemaError {
     /// Specified schema and frame encodings are incompatible.
     #[error("Specified schema and frame encodings are incompatible")]
     Incompatible,
+
+    /// The 'other' encoding represents an unrecognized encoding on received tracks
+    /// and cannot be used when publishing.
+    #[error("The 'other' encoding cannot be used when publishing")]
+    OtherEncoding,
 }
 
 /// Validates that the given frame and schema encodings are compatible.
@@ -193,7 +202,12 @@ pub(crate) fn validate_schema(
     frame_encoding: Option<&DataTrackFrameEncoding>,
     schema_encoding: Option<&DataTrackSchemaEncoding>,
 ) -> Result<(), DataTrackSchemaError> {
+    use DataTrackFrameEncoding as FrameEncoding;
+    use DataTrackSchemaEncoding as SchemaEncoding;
     match (frame_encoding, schema_encoding) {
+        (Some(FrameEncoding::Other), _) | (_, Some(SchemaEncoding::Other)) => {
+            Err(DataTrackSchemaError::OtherEncoding)
+        }
         (None, Some(_)) => Err(DataTrackSchemaError::MissingFrameEncoding),
         (Some(frame_encoding), None) => match frame_encoding.is_self_describing() {
             Some(false) => Err(DataTrackSchemaError::MissingSchemaId),
@@ -230,7 +244,10 @@ impl DataTrackFrameEncoding {
             | (Self::Protobuf, SchemaEncoding::Protobuf)
             | (Self::Flatbuffer, SchemaEncoding::Flatbuffer)
             | (Self::Json, SchemaEncoding::JsonSchema) => Some(true),
-            (Self::Other, _) | (Self::Custom(_), _) => None, // Cannot be determined
+            (Self::Other, _)
+            | (Self::Custom(_), _)
+            | (_, SchemaEncoding::Other)
+            | (_, SchemaEncoding::Custom(_)) => None, // Cannot be determined
             _ => Some(false),
         }
     }
@@ -383,6 +400,36 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_validate_schema_custom_schema_encoding() {
+        assert_eq!(
+            validate_schema(
+                Some(&DataTrackFrameEncoding::Json),
+                Some(&DataTrackSchemaEncoding::Custom("my-schema-encoding".to_string()))
+            ),
+            Ok(())
+        );
+    }
+
+    #[test]
+    fn test_validate_schema_other_schema_encoding() {
+        assert_eq!(
+            validate_schema(
+                Some(&DataTrackFrameEncoding::Json),
+                Some(&DataTrackSchemaEncoding::Other)
+            ),
+            Err(DataTrackSchemaError::OtherEncoding)
+        );
+    }
+
+    #[test]
+    fn test_validate_schema_other_frame_encoding() {
+        assert_eq!(
+            validate_schema(Some(&DataTrackFrameEncoding::Other), None),
+            Err(DataTrackSchemaError::OtherEncoding)
+        );
+    }
+
     #[test]
     fn test_validate_schema_missing_frame_encoding() {
         assert_eq!(

From 6bf5dd9b67587e5eb843319f10f5c7cfb942ba86 Mon Sep 17 00:00:00 2001
From: Jacob Gelman <3182119+ladvoc@users.noreply.github.com>
Date: Thu, 13 Aug 2026 11:06:50 -0700
Subject: [PATCH 2/2] Update schema metadata validation logic

Update schema metadata validation logic as per issue #1328.
---
 .changeset/update_schema_metadata_validation_logic.md | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .changeset/update_schema_metadata_validation_logic.md

diff --git a/.changeset/update_schema_metadata_validation_logic.md b/.changeset/update_schema_metadata_validation_logic.md
new file mode 100644
index 000000000..2cc909578
--- /dev/null
+++ b/.changeset/update_schema_metadata_validation_logic.md
@@ -0,0 +1,8 @@
+---
+livekit: patch
+livekit-datatrack: patch
+livekit-ffi: patch
+livekit-uniffi: patch
+---
+
+Update schema metadata validation logic - #1328 (@ladvoc)