Skip to content
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

Adds safe bindings for set_new_segment_callback #97

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub use error::WhisperError;
pub use standalone::*;
pub use utilities::*;
pub use whisper_ctx::WhisperContext;
pub use whisper_params::{FullParams, SamplingStrategy};
pub use whisper_params::{FullParams, SamplingStrategy, SegmentCallbackData};
pub use whisper_state::WhisperState;

pub type WhisperSysContext = whisper_rs_sys::whisper_context;
Expand Down
83 changes: 83 additions & 0 deletions src/whisper_params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,22 @@ impl Default for SamplingStrategy {
}
}

#[derive(Debug, Clone)]
pub struct SegmentCallbackData {
pub segment: i32,
pub start_timestamp: i64,
pub end_timestamp: i64,
pub text: String,
}

type SegmentCallbackFn = Box<dyn FnMut(SegmentCallbackData)>;

pub struct FullParams<'a, 'b> {
pub(crate) fp: whisper_rs_sys::whisper_full_params,
phantom_lang: PhantomData<&'a str>,
phantom_tokens: PhantomData<&'b [c_int]>,
progess_callback_safe: Option<Box<dyn FnMut(i32)>>,
segment_calllback_safe: Option<SegmentCallbackFn>,
}

impl<'a, 'b> FullParams<'a, 'b> {
Expand Down Expand Up @@ -59,6 +70,7 @@ impl<'a, 'b> FullParams<'a, 'b> {
phantom_lang: PhantomData,
phantom_tokens: PhantomData,
progess_callback_safe: None,
segment_calllback_safe: None,
}
}

Expand Down Expand Up @@ -373,6 +385,77 @@ impl<'a, 'b> FullParams<'a, 'b> {
self.fp.new_segment_callback_user_data = user_data;
}

/// Set the callback for segment updates.
///
/// Provides a limited segment_callback to ensure safety.
/// See `set_new_segment_callback` if you need to use `whisper_context` and `whisper_state`
///
/// Defaults to None.
pub fn set_segment_callback_safe<O, F>(&mut self, closure: O)
where
F: FnMut(SegmentCallbackData) + 'static,
O: Into<Option<F>>,
{
use std::ffi::{c_void, CStr};
use whisper_rs_sys::{whisper_context, whisper_state};

extern "C" fn trampoline<F>(
_: *mut whisper_context,
state: *mut whisper_state,
n_new: i32,
user_data: *mut c_void,
) where
F: FnMut(SegmentCallbackData) + 'static,
{
unsafe {
let user_data = &mut *(user_data as *mut SegmentCallbackFn);
let n_segments = whisper_rs_sys::whisper_full_n_segments_from_state(state);
let s0 = n_segments - n_new;
//let user_data = user_data as *mut Box<dyn FnMut(SegmentCallbackData)>;

for i in s0..n_segments {
let text = whisper_rs_sys::whisper_full_get_segment_text_from_state(state, i);
let text = CStr::from_ptr(text);

let t0 = whisper_rs_sys::whisper_full_get_segment_t0_from_state(state, i);
let t1 = whisper_rs_sys::whisper_full_get_segment_t1_from_state(state, i);

match text.to_str() {
Ok(n) => {
user_data(SegmentCallbackData {
segment: i,
start_timestamp: t0,
end_timestamp: t1,
text: n.to_string(),
})
}
Err(_) => {}
}
}
}
}

match closure.into() {
Some(closure) => {
// Stable address
let closure = Box::new(closure) as SegmentCallbackFn;
// Thin pointer
let closure = Box::new(closure);
// Raw pointer
let closure = Box::into_raw(closure);

self.fp.new_segment_callback_user_data = closure as *mut c_void;
self.fp.new_segment_callback = Some(trampoline::<SegmentCallbackFn>);
self.segment_calllback_safe = None;
}
None => {
self.segment_calllback_safe = None;
self.fp.new_segment_callback = None;
self.fp.new_segment_callback_user_data = std::ptr::null_mut::<c_void>();
}
}
}

/// Set the callback for progress updates.
///
/// Note that is still a C callback.
Expand Down