Skip to content
This repository was archived by the owner on Jul 30, 2025. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/whisper_params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub struct FullParams<'a, 'b> {
phantom_lang: PhantomData<&'a str>,
phantom_tokens: PhantomData<&'b [c_int]>,
grammar: Option<Vec<whisper_rs_sys::whisper_grammar_element>>,
progess_callback_safe: Option<Arc<Box<dyn FnMut(i32)>>>,
progress_callback_safe: Option<Arc<Box<dyn FnMut(i32)>>>,
abort_callback_safe: Option<Arc<Box<dyn FnMut() -> bool>>>,
segment_calllback_safe: Option<Arc<SegmentCallbackFn>>,
}
Expand Down Expand Up @@ -75,7 +75,7 @@ impl<'a, 'b> FullParams<'a, 'b> {
phantom_lang: PhantomData,
phantom_tokens: PhantomData,
grammar: None,
progess_callback_safe: None,
progress_callback_safe: None,
abort_callback_safe: None,
segment_calllback_safe: None,
}
Expand Down Expand Up @@ -579,16 +579,18 @@ impl<'a, 'b> FullParams<'a, 'b> {
}

match closure.into() {
Some(mut closure) => {
self.fp.progress_callback = Some(trampoline::<F>);
self.fp.progress_callback_user_data = &mut closure as *mut F as *mut c_void;
// store the closure internally to make sure that the pointer above remains valid
self.progess_callback_safe = Some(Arc::new(Box::new(closure)));
Some(closure) => {
self.fp.progress_callback = Some(trampoline::<Box<dyn FnMut(i32)>>);
let boxed_closure = Box::new(closure) as Box<dyn FnMut(i32)>;
let boxed_closure = Box::new(boxed_closure);
let raw_ptr = Box::into_raw(boxed_closure);
self.fp.progress_callback_user_data = raw_ptr as *mut c_void;
self.progress_callback_safe = None;
}
None => {
self.fp.progress_callback = None;
self.fp.progress_callback_user_data = std::ptr::null_mut::<c_void>();
self.progess_callback_safe = None;
self.progress_callback_safe = None;
}
}
}
Expand Down
Loading