@@ -6632,10 +6632,9 @@ static bool whisper_vad(
6632
6632
struct whisper_full_params params,
6633
6633
const float * samples,
6634
6634
int n_samples,
6635
- std::vector<float > & filtered_samples,
6636
- int & filtered_n_samples) {
6635
+ std::vector<float > & filtered_samples) {
6637
6636
WHISPER_LOG_INFO (" %s: VAD is enabled, processing speech segments only\n " , __func__);
6638
- filtered_n_samples = 0 ;
6637
+ int filtered_n_samples = 0 ;
6639
6638
6640
6639
// Clear any existing mapping table
6641
6640
state->vad_mapping_table .clear ();
@@ -7735,16 +7734,15 @@ int whisper_full(
7735
7734
std::vector<float > vad_samples;
7736
7735
if (params.vad ) {
7737
7736
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)) {
7740
7738
WHISPER_LOG_ERROR (" %s: failed to compute VAD\n " , __func__);
7741
7739
return -1 ;
7742
7740
}
7743
- if (vad_n_samples == 0 ) {
7741
+ if (vad_samples. empty () ) {
7744
7742
return 0 ;
7745
7743
}
7746
7744
samples = vad_samples.data ();
7747
- n_samples = vad_n_samples ;
7745
+ n_samples = vad_samples. size () ;
7748
7746
}
7749
7747
return whisper_full_with_state (ctx, ctx->state , params, samples, n_samples);
7750
7748
}
@@ -7763,16 +7761,15 @@ int whisper_full_parallel(
7763
7761
std::vector<float > vad_samples;
7764
7762
if (params.vad ) {
7765
7763
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)) {
7768
7765
WHISPER_LOG_ERROR (" %s: failed to compute VAD\n " , __func__);
7769
7766
return -1 ;
7770
7767
}
7771
- if (vad_n_samples == 0 ) {
7768
+ if (vad_samples. empty () ) {
7772
7769
return 0 ;
7773
7770
}
7774
7771
samples = vad_samples.data ();
7775
- n_samples = vad_n_samples ;
7772
+ n_samples = vad_samples. size () ;
7776
7773
}
7777
7774
int ret = 0 ;
7778
7775
0 commit comments