Skip to content

Commit 47a5dc3

Browse files
committed
vad : remove filtered_n_samples from whisper_vad
The commit removes the parameter `filtered_n_samples` from the `whisper_vad` function signature and its usage, as it is no longer needed since filtered samples is now a vector (previously it was a float*) The motivation for this is to simplify the usage of this function.
1 parent 7497754 commit 47a5dc3

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

src/whisper.cpp

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6632,10 +6632,9 @@ static bool whisper_vad(
66326632
struct whisper_full_params params,
66336633
const float * samples,
66346634
int n_samples,
6635-
std::vector<float> & filtered_samples,
6636-
int & filtered_n_samples) {
6635+
std::vector<float> & filtered_samples) {
66376636
WHISPER_LOG_INFO("%s: VAD is enabled, processing speech segments only\n", __func__);
6638-
filtered_n_samples = 0;
6637+
int filtered_n_samples = 0;
66396638

66406639
// Clear any existing mapping table
66416640
state->vad_mapping_table.clear();
@@ -7735,16 +7734,15 @@ int whisper_full(
77357734
std::vector<float> vad_samples;
77367735
if (params.vad) {
77377736
WHISPER_LOG_INFO("%s: VAD is enabled, processing speech segments only\n", __func__);
7738-
int vad_n_samples;
7739-
if (!whisper_vad(ctx, ctx->state, params, samples, n_samples, vad_samples, vad_n_samples)) {
7737+
if (!whisper_vad(ctx, ctx->state, params, samples, n_samples, vad_samples)) {
77407738
WHISPER_LOG_ERROR("%s: failed to compute VAD\n", __func__);
77417739
return -1;
77427740
}
7743-
if (vad_n_samples == 0) {
7741+
if (vad_samples.empty()) {
77447742
return 0;
77457743
}
77467744
samples = vad_samples.data();
7747-
n_samples = vad_n_samples;
7745+
n_samples = vad_samples.size();
77487746
}
77497747
return whisper_full_with_state(ctx, ctx->state, params, samples, n_samples);
77507748
}
@@ -7763,16 +7761,15 @@ int whisper_full_parallel(
77637761
std::vector<float> vad_samples;
77647762
if (params.vad) {
77657763
WHISPER_LOG_INFO("%s: VAD is enabled, processing speech segments only\n", __func__);
7766-
int vad_n_samples;
7767-
if (!whisper_vad(ctx, ctx->state, params, samples, n_samples, vad_samples, vad_n_samples)) {
7764+
if (!whisper_vad(ctx, ctx->state, params, samples, n_samples, vad_samples)) {
77687765
WHISPER_LOG_ERROR("%s: failed to compute VAD\n", __func__);
77697766
return -1;
77707767
}
7771-
if (vad_n_samples == 0) {
7768+
if (vad_samples.empty()) {
77727769
return 0;
77737770
}
77747771
samples = vad_samples.data();
7775-
n_samples = vad_n_samples;
7772+
n_samples = vad_samples.size();
77767773
}
77777774
int ret = 0;
77787775

0 commit comments

Comments
 (0)