harald/wyoming-whisper-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #210 from newfla/fix_callback_v2

Browse source
This commit is contained in:
Niko 2025-03-03 09:57:57 -07:00 • committed by GitHub
commit f5ee632f6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 38 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/whisper_params.rs
View file

@ -376,6 +376,7 @@ impl<'a, 'b> FullParams<'a, 'b> {
/// Do not use this function unless you know what you are doing. /// Do not use this function unless you know what you are doing.
/// * Be careful not to mutate the state of the whisper_context pointer returned in the callback. /// * Be careful not to mutate the state of the whisper_context pointer returned in the callback.
/// This could cause undefined behavior, as this violates the thread-safety guarantees of the underlying C library. /// This could cause undefined behavior, as this violates the thread-safety guarantees of the underlying C library.
/// **Warning** Can't be used with DTW. DTW will produce inconsistent callback invocation
/// ///
/// Defaults to None. /// Defaults to None.
pub unsafe fn set_new_segment_callback( pub unsafe fn set_new_segment_callback(
@ -389,6 +390,7 @@ impl<'a, 'b> FullParams<'a, 'b> {
/// ///
/// # Safety /// # Safety
/// See the safety notes for `set_new_segment_callback`. /// See the safety notes for `set_new_segment_callback`.
/// **Warning** Can't be used with DTW. DTW will produce inconsistent callback invocation
/// ///
/// Defaults to None. /// Defaults to None.
pub unsafe fn set_new_segment_callback_user_data(&mut self, user_data: *mut std::ffi::c_void) { pub unsafe fn set_new_segment_callback_user_data(&mut self, user_data: *mut std::ffi::c_void) {
@ -399,6 +401,7 @@ impl<'a, 'b> FullParams<'a, 'b> {
/// ///
/// Provides a limited segment_callback to ensure safety. /// Provides a limited segment_callback to ensure safety.
/// See `set_new_segment_callback` if you need to use `whisper_context` and `whisper_state` /// See `set_new_segment_callback` if you need to use `whisper_context` and `whisper_state`
/// **Warning** Can't be used with DTW. DTW will produce inconsistent callback invocation
/// ///
/// Defaults to None. /// Defaults to None.
pub fn set_segment_callback_safe<O, F>(&mut self, closure: O) pub fn set_segment_callback_safe<O, F>(&mut self, closure: O)
@ -419,15 +422,20 @@ impl<'a, 'b> FullParams<'a, 'b> {
{ {
unsafe { unsafe {
let user_data = &mut *(user_data as *mut SegmentCallbackFn); let user_data = &mut *(user_data as *mut SegmentCallbackFn);
let text = whisper_rs_sys::whisper_full_get_segment_text_from_state(state, n_new); 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 text = CStr::from_ptr(text);
let t0 = whisper_rs_sys::whisper_full_get_segment_t0_from_state(state, n_new); 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, n_new); let t1 = whisper_rs_sys::whisper_full_get_segment_t1_from_state(state, i);
match text.to_str() { match text.to_str() {
Ok(n) => user_data(SegmentCallbackData { Ok(n) => user_data(SegmentCallbackData {
segment: n_new + 1, segment: i,
start_timestamp: t0, start_timestamp: t0,
end_timestamp: t1, end_timestamp: t1,
text: n.to_string(), text: n.to_string(),
@ -436,6 +444,7 @@ impl<'a, 'b> FullParams<'a, 'b> {
} }
} }
} }
}
match closure.into() { match closure.into() {
Some(closure) => { Some(closure) => {
@ -462,6 +471,7 @@ impl<'a, 'b> FullParams<'a, 'b> {
/// ///
/// Provides a limited segment_callback to ensure safety with lossy handling of bad UTF-8 characters. /// Provides a limited segment_callback to ensure safety with lossy handling of bad UTF-8 characters.
/// See `set_new_segment_callback` if you need to use `whisper_context` and `whisper_state`. /// See `set_new_segment_callback` if you need to use `whisper_context` and `whisper_state`.
/// **Warning** Can't be used with DTW. DTW will produce inconsistent callback invocation
/// ///
/// Defaults to None. /// Defaults to None.
pub fn set_segment_callback_safe_lossy<O, F>(&mut self, closure: O) pub fn set_segment_callback_safe_lossy<O, F>(&mut self, closure: O)
@ -482,19 +492,25 @@ impl<'a, 'b> FullParams<'a, 'b> {
{ {
unsafe { unsafe {
let user_data = &mut *(user_data as *mut SegmentCallbackFn); let user_data = &mut *(user_data as *mut SegmentCallbackFn);
let text = whisper_rs_sys::whisper_full_get_segment_text_from_state(state, n_new); 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 text = CStr::from_ptr(text);
let t0 = whisper_rs_sys::whisper_full_get_segment_t0_from_state(state, n_new); 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, n_new); let t1 = whisper_rs_sys::whisper_full_get_segment_t1_from_state(state, i);
user_data(SegmentCallbackData { user_data(SegmentCallbackData {
segment: n_new, segment: i,
start_timestamp: t0, start_timestamp: t0,
end_timestamp: t1, end_timestamp: t1,
text: text.to_string_lossy().to_string(), text: text.to_string_lossy().to_string(),
}); });
} }
} }
}
match closure.into() { match closure.into() {
Some(closure) => { Some(closure) => {