-
Notifications
You must be signed in to change notification settings - Fork 237
Example of exposing a livekit-ffi feature over uniffi - sox resampler #1397
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
1egoman
wants to merge
2
commits into
main
Choose a base branch
from
livekit-ffi-sox-resampler
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| // Copyright 2026 LiveKit, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| use std::mem::ManuallyDrop; | ||
|
|
||
| use crate::{server::FfiHandle, FfiHandleId, FfiResult, FFI_SERVER}; | ||
|
|
||
| /// A wrapper over an [`FfiHandleId`] whose state lives in the [`FFI_SERVER`] | ||
| /// handle map rather than in the wrapper itself. | ||
| /// | ||
| /// This is what lets a UniFFI object and the legacy C ABI operate on one shared | ||
| /// value: the UniFFI object stores only the id, and resolves [`Self::Inner`] out | ||
| /// of the handle store on every call, exactly as the protobuf request handlers | ||
| /// in [`crate::server::requests`] do. | ||
| /// | ||
| /// # Ownership | ||
| /// | ||
| /// Ownership is RAII. [`Self::from_ffi_handle_id`] *adopts* a handle, and | ||
| /// implementors are expected to `impl Drop` and call | ||
| /// `FFI_SERVER.drop_handle(self.ffi_handle_id())` there. Rust cannot make `Drop` | ||
| /// part of a trait contract, so that is a convention this trait documents rather | ||
| /// than enforces. | ||
| /// | ||
| /// Two escape hatches exist, and the distinction between them matters: | ||
| /// | ||
| /// * [`Self::ffi_handle_id`] borrows the id. The caller may use it to address the | ||
| /// same state over the legacy C ABI, but must **not** free it — this value is | ||
| /// still the owner. | ||
| /// * [`Self::leak_ffi_handle_id`] consumes `self` and hands ownership out, so the | ||
| /// handle survives and the caller becomes responsible for freeing it (via | ||
| /// `livekit_ffi_drop_handle`). | ||
| pub trait BackedByFfiHandle: Sized { | ||
| /// The type actually stored in the handle map. | ||
| /// | ||
| /// For the two surfaces to share state this must be the *identical* type the | ||
| /// legacy handlers pass to [`crate::server::FfiServer::retrieve_handle`] — | ||
| /// that lookup is a downcast, so a merely structurally-similar type resolves | ||
| /// to `FfiError::InvalidRequest("handle is not a ...")`. | ||
| type Inner: FfiHandle + Clone; | ||
|
|
||
| /// Adopt an existing handle. | ||
| /// | ||
| /// This *takes ownership*: dropping the returned value drops the handle. | ||
| fn from_ffi_handle_id(ffi_handle_id: FfiHandleId) -> Self; | ||
|
|
||
| /// Borrow the handle id. Does **not** transfer ownership. | ||
| fn ffi_handle_id(&self) -> FfiHandleId; | ||
|
|
||
| /// Consume `self` and return the handle id *without* dropping the handle. | ||
| /// | ||
| /// Use this to move ownership back to the legacy C ABI. The caller must | ||
| /// eventually free the handle. | ||
| fn leak_ffi_handle_id(self) -> FfiHandleId { | ||
| // Suppress the implementor's `Drop` (and so its `drop_handle` call) | ||
| // while still reading the id out. | ||
| let this = ManuallyDrop::new(self); | ||
| this.ffi_handle_id() | ||
| } | ||
|
|
||
| /// Given an instance of [Self::Inner], stores the object into the handle map | ||
| /// and returns a new instance of the [BackedByFfiHandle] wrapper type. | ||
| fn from_inner(inner: Self::Inner) -> Self { | ||
| let handle_id = FFI_SERVER.next_id(); | ||
| FFI_SERVER.store_handle(handle_id, inner); | ||
| Self::from_ffi_handle_id(handle_id) | ||
| } | ||
|
|
||
| /// Resolve the backing value out of the handle store. | ||
| /// | ||
| /// The clone releases the dashmap shard's read guard before returning, so a | ||
| /// caller that then locks an inner mutex is not holding two locks at once. | ||
| /// This mirrors the `retrieve_handle(..)?.clone()` idiom in | ||
| /// [`crate::server::requests`]. | ||
| fn inner(&self) -> FfiResult<Self::Inner> { | ||
| FFI_SERVER | ||
| .retrieve_handle::<Self::Inner>(self.ffi_handle_id()) | ||
| .map(|handle| Self::Inner::clone(&handle)) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // Copyright 2026 LiveKit, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| //! The UniFFI-facing surface of `livekit-ffi`. | ||
| //! | ||
| //! Types here are the UniFFI counterparts of the protobuf request handlers in | ||
| //! [`crate::server::requests`]. They deliberately hold no state of their own: | ||
| //! each one is a thin wrapper over an [`crate::FfiHandleId`] whose backing value | ||
| //! lives in the [`crate::FFI_SERVER`] handle map, so the exact same value is | ||
| //! reachable from both this surface and the legacy C ABI. See | ||
| //! [`backed_by_ffi_handle::BackedByFfiHandle`]. | ||
| //! | ||
| //! Nothing in here modifies the legacy C ABI; the two surfaces are additive | ||
| //! views onto one handle store. | ||
|
|
||
| pub mod backed_by_ffi_handle; | ||
| pub mod sox_resampler; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is worth reading - I am proposing all new uniffi livekit-ffi objects would implement this trait. It's a in essence a lot like the existing
FfiHandletype.