rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

Add gst_video::convert_frame_async_local() without Send bound on the closure

Browse source
This commit is contained in:
Sebastian Dröge 2019-02-10 11:47:28 +02:00
parent 09ad177315
commit e6992345cc
1 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gstreamer-video/src/functions.rs
View file

@ -46,16 +46,41 @@ pub fn convert_sample_async<F>(
func: F, func: F,
) where ) where
F: FnOnce(Result<gst::Sample, glib::Error>) + Send + 'static, F: FnOnce(Result<gst::Sample, glib::Error>) + Send + 'static,
{
unsafe { convert_sample_async_unsafe(sample, caps, timeout, func) }
}
pub fn convert_sample_async_local<F>(
sample: &gst::Sample,
caps: &gst::Caps,
timeout: gst::ClockTime,
func: F,
) where
F: FnOnce(Result<gst::Sample, glib::Error>) + Send + 'static,
{
unsafe {
assert!(glib::MainContext::ref_thread_default().is_owner());
convert_sample_async_unsafe(sample, caps, timeout, func)
}
}
unsafe fn convert_sample_async_unsafe<F>(
sample: &gst::Sample,
caps: &gst::Caps,
timeout: gst::ClockTime,
func: F,
) where
F: FnOnce(Result<gst::Sample, glib::Error>) + 'static,
{ {
unsafe extern "C" fn convert_sample_async_trampoline<F>( unsafe extern "C" fn convert_sample_async_trampoline<F>(
sample: *mut gst_ffi::GstSample, sample: *mut gst_ffi::GstSample,
error: *mut glib_ffi::GError, error: *mut glib_ffi::GError,
user_data: glib_ffi::gpointer, user_data: glib_ffi::gpointer,
) where ) where
F: FnOnce(Result<gst::Sample, glib::Error>) + Send + 'static, F: FnOnce(Result<gst::Sample, glib::Error>) + 'static,
{ {
#[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]
let callback: &mut Option<F> = mem::transmute(user_data); let callback: &mut Option<F> = &mut *(user_data as *mut Option<F>);
let callback = callback.take().unwrap(); let callback = callback.take().unwrap();
if error.is_null() { if error.is_null() {
@ -66,23 +91,21 @@ pub fn convert_sample_async<F>(
} }
unsafe extern "C" fn convert_sample_async_free<F>(user_data: glib_ffi::gpointer) unsafe extern "C" fn convert_sample_async_free<F>(user_data: glib_ffi::gpointer)
where where
F: FnOnce(Result<gst::Sample, glib::Error>) + Send + 'static, F: FnOnce(Result<gst::Sample, glib::Error>) + 'static,
{ {
let _: Box<Option<F>> = Box::from_raw(user_data as *mut _); let _: Box<Option<F>> = Box::from_raw(user_data as *mut _);
} }
unsafe { let user_data: Box<Option<F>> = Box::new(Some(func));
let user_data: Box<Option<F>> = Box::new(Some(func));
ffi::gst_video_convert_sample_async( ffi::gst_video_convert_sample_async(
sample.to_glib_none().0, sample.to_glib_none().0,
caps.to_glib_none().0, caps.to_glib_none().0,
timeout.to_glib(), timeout.to_glib(),
Some(convert_sample_async_trampoline::<F>), Some(convert_sample_async_trampoline::<F>),
Box::into_raw(user_data) as glib_ffi::gpointer, Box::into_raw(user_data) as glib_ffi::gpointer,
Some(convert_sample_async_free::<F>), Some(mem::transmute(convert_sample_async_free::<F> as usize)),
); );
}
} }
#[cfg(test)] #[cfg(test)]