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

Restructure to minimize the number of unsafe calls in VAD code

Browse source
This commit is contained in:
Niko 2025-07-30 17:42:24 -07:00
parent ef095214b7
commit ac6b01dd91
No known key found for this signature in database
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/whisper_vad.rs
View file

@ -250,9 +250,13 @@ impl WhisperVadSegments {
self.segment_count self.segment_count
} }
pub fn index_in_bounds(&self, idx: c_int) -> bool {
idx < 0 || idx > self.segment_count
}
/// Return the start timestamp of this segment in centiseconds (10s of milliseconds). /// Return the start timestamp of this segment in centiseconds (10s of milliseconds).
pub fn get_segment_start_timestamp(&self, idx: c_int) -> Option<f32> { pub fn get_segment_start_timestamp(&self, idx: c_int) -> Option<f32> {
if idx < 0 || idx > self.segment_count { if self.index_in_bounds(idx) {
None None
} else { } else {
Some(unsafe { whisper_vad_segments_get_segment_t0(self.ptr, idx) }) Some(unsafe { whisper_vad_segments_get_segment_t0(self.ptr, idx) })
@ -261,7 +265,7 @@ impl WhisperVadSegments {
/// Return the end timestamp of this segment in centiseconds (10s of milliseconds). /// Return the end timestamp of this segment in centiseconds (10s of milliseconds).
pub fn get_segment_end_timestamp(&self, idx: c_int) -> Option<f32> { pub fn get_segment_end_timestamp(&self, idx: c_int) -> Option<f32> {
if idx < 0 || idx > self.segment_count { if self.index_in_bounds(idx) {
None None
} else { } else {
Some(unsafe { whisper_vad_segments_get_segment_t1(self.ptr, idx) }) Some(unsafe { whisper_vad_segments_get_segment_t1(self.ptr, idx) })
@ -269,14 +273,11 @@ impl WhisperVadSegments {
} }
pub fn get_segment(&self, idx: c_int) -> Option<WhisperVadSegment> { pub fn get_segment(&self, idx: c_int) -> Option<WhisperVadSegment> {
if idx < 0 || idx > self.segment_count { let start = self.get_segment_start_timestamp(idx)?;
None let end = self.get_segment_end_timestamp(idx)?;
} else {
let start = unsafe { whisper_vad_segments_get_segment_t0(self.ptr, self.iter_idx) };
let end = unsafe { whisper_vad_segments_get_segment_t1(self.ptr, self.iter_idx) };
Some(WhisperVadSegment { start, end }) Some(WhisperVadSegment { start, end })
} }
}
} }
impl Iterator for WhisperVadSegments { impl Iterator for WhisperVadSegments {