Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use CFRelease instead of a custom LKRelease

Browse source
This commit is contained in:
Antonio Scandurra 2022-10-18 15:47:56 +02:00
parent 48a1dd1588
commit 29b9651ebd
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/live_kit_client/LiveKitBridge/Sources/LiveKitBridge/LiveKitBridge.swift
View file

@ -55,11 +55,6 @@ class LKVideoRenderer: NSObject, VideoRenderer {
} }
} }
@_cdecl("LKRelease")
public func LKRelease(ptr: UnsafeRawPointer) {
let _ = Unmanaged<AnyObject>.fromOpaque(ptr).takeRetainedValue()
}
@_cdecl("LKRoomDelegateCreate") @_cdecl("LKRoomDelegateCreate")
public func LKRoomDelegateCreate(data: UnsafeRawPointer, onDidSubscribeToRemoteVideoTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString, UnsafeRawPointer) -> Void, onDidUnsubscribeFromRemoteVideoTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString) -> Void) -> UnsafeMutableRawPointer { public func LKRoomDelegateCreate(data: UnsafeRawPointer, onDidSubscribeToRemoteVideoTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString, UnsafeRawPointer) -> Void, onDidUnsubscribeFromRemoteVideoTrack: @escaping @convention(c) (UnsafeRawPointer, CFString, CFString) -> Void) -> UnsafeMutableRawPointer {
let delegate = LKRoomDelegate(data: data, onDidSubscribeToRemoteVideoTrack: onDidSubscribeToRemoteVideoTrack, onDidUnsubscribeFromRemoteVideoTrack: onDidUnsubscribeFromRemoteVideoTrack) let delegate = LKRoomDelegate(data: data, onDidSubscribeToRemoteVideoTrack: onDidSubscribeToRemoteVideoTrack, onDidUnsubscribeFromRemoteVideoTrack: onDidUnsubscribeFromRemoteVideoTrack)

14
crates/live_kit_client/src/live_kit_client.rs
View file

@ -1,7 +1,7 @@
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use core_foundation::{ use core_foundation::{
array::{CFArray, CFArrayRef}, array::{CFArray, CFArrayRef},
base::{CFRetain, TCFType}, base::{CFRelease, CFRetain, TCFType},
string::{CFString, CFStringRef}, string::{CFString, CFStringRef},
}; };
use futures::{ use futures::{
@ -18,8 +18,6 @@ use std::{
pub type Sid = String; pub type Sid = String;
extern "C" { extern "C" {
fn LKRelease(object: *const c_void);
fn LKRoomDelegateCreate( fn LKRoomDelegateCreate(
callback_data: *mut c_void, callback_data: *mut c_void,
on_did_subscribe_to_remote_video_track: extern "C" fn( on_did_subscribe_to_remote_video_track: extern "C" fn(
@ -198,7 +196,7 @@ impl Drop for Room {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
LKRoomDisconnect(self.native_room); LKRoomDisconnect(self.native_room);
LKRelease(self.native_room); CFRelease(self.native_room);
} }
} }
} }
@ -257,7 +255,7 @@ impl RoomDelegate {
impl Drop for RoomDelegate { impl Drop for RoomDelegate {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
LKRelease(self.native_delegate); CFRelease(self.native_delegate);
let _ = Weak::from_raw(self.weak_room); let _ = Weak::from_raw(self.weak_room);
} }
} }
@ -273,7 +271,7 @@ impl LocalVideoTrack {
impl Drop for LocalVideoTrack { impl Drop for LocalVideoTrack {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { LKRelease(self.0) } unsafe { CFRelease(self.0) }
} }
} }
@ -336,7 +334,7 @@ impl RemoteVideoTrack {
impl Drop for RemoteVideoTrack { impl Drop for RemoteVideoTrack {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { LKRelease(self.native_track) } unsafe { CFRelease(self.native_track) }
} }
} }
@ -358,7 +356,7 @@ impl MacOSDisplay {
impl Drop for MacOSDisplay { impl Drop for MacOSDisplay {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { LKRelease(self.0) } unsafe { CFRelease(self.0) }
} }
} }