ExternalVendorCode/whisper.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/whisper.cpp.git synced 2024-12-19 04:37:51 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

whisper : allow whisper_full from mel spectrogram - no audio (#1214)

Browse Source 
Co-authored-by: jbrough <jamie1612@gmail.com>
This commit is contained in:
Georgi Gerganov 2023-08-27 20:02:57 +03:00 committed by GitHub
parent 7e54df414e
commit b5bb5c85d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
whisper.cpp
View File

@ -3140,7 +3140,6 @@ int whisper_decode(struct whisper_context * ctx, const whisper_token * tokens, i
return false; return false;
} }
if (!whisper_decode_internal(*ctx, *ctx->state, ctx->state->decoders[selected_decoder_id], tokens, n_tokens, n_past, n_threads)) { if (!whisper_decode_internal(*ctx, *ctx->state, ctx->state->decoders[selected_decoder_id], tokens, n_tokens, n_past, n_threads)) {
log("%s: failed to eval\n", __func__); log("%s: failed to eval\n", __func__);
return 1; return 1;
@ -3374,7 +3373,6 @@ float * whisper_get_logits(struct whisper_context * ctx) {
return ctx->state->logits.data(); return ctx->state->logits.data();
} }
float * whisper_get_logits_from_state(struct whisper_state * state) { float * whisper_get_logits_from_state(struct whisper_state * state) {
return state->logits.data(); return state->logits.data();
} }
@ -4087,15 +4085,17 @@ int whisper_full_with_state(
result_all.clear(); result_all.clear();
// compute log mel spectrogram if (n_samples > 0) {
if (params.speed_up) { // compute log mel spectrogram
// TODO: Replace PV with more advanced algorithm if (params.speed_up) {
log("%s: failed to compute log mel spectrogram\n", __func__); // TODO: Replace PV with more advanced algorithm
return -1;
} else {
if (whisper_pcm_to_mel_with_state(ctx, state, samples, n_samples, params.n_threads) != 0) {
log("%s: failed to compute log mel spectrogram\n", __func__); log("%s: failed to compute log mel spectrogram\n", __func__);
return -2; return -1;
} else {
if (whisper_pcm_to_mel_with_state(ctx, state, samples, n_samples, params.n_threads) != 0) {
log("%s: failed to compute log mel spectrogram\n", __func__);
return -2;
}
} }
} }
@ -4121,7 +4121,9 @@ int whisper_full_with_state(
state->t_beg = 0; state->t_beg = 0;
state->t_last = 0; state->t_last = 0;
state->tid_last = 0; state->tid_last = 0;
state->energy = get_signal_energy(samples, n_samples, 32); if (n_samples > 0) {
state->energy = get_signal_energy(samples, n_samples, 32);
}
} }
const int seek_start = params.offset_ms/10; const int seek_start = params.offset_ms/10;
@ -4258,7 +4260,7 @@ int whisper_full_with_state(
while (true) { while (true) {
if (params.progress_callback) { if (params.progress_callback) {
const int progress_cur = (100*(seek - seek_start))/(seek_end - seek_start); const int progress_cur = (100*(seek - seek_start))/(seek_end - seek_start);
params.progress_callback( params.progress_callback(
ctx, ctx->state, progress_cur, params.progress_callback_user_data); ctx, ctx->state, progress_cur, params.progress_callback_user_data);
} }
@ -4813,7 +4815,6 @@ int whisper_full_with_state(
return 0; return 0;
} }
int whisper_full( int whisper_full(
struct whisper_context * ctx, struct whisper_context * ctx,
struct whisper_full_params params, struct whisper_full_params params,
@ -4890,7 +4891,6 @@ int whisper_full_parallel(
result.t0 += 100 * ((i + 1) * n_samples_per_processor) / WHISPER_SAMPLE_RATE + offset_t; result.t0 += 100 * ((i + 1) * n_samples_per_processor) / WHISPER_SAMPLE_RATE + offset_t;
result.t1 += 100 * ((i + 1) * n_samples_per_processor) / WHISPER_SAMPLE_RATE + offset_t; result.t1 += 100 * ((i + 1) * n_samples_per_processor) / WHISPER_SAMPLE_RATE + offset_t;
// make sure that segments are not overlapping // make sure that segments are not overlapping
if (!ctx->state->result_all.empty()) { if (!ctx->state->result_all.empty()) {
result.t0 = std::max(result.t0, ctx->state->result_all.back().t1); result.t0 = std::max(result.t0, ctx->state->result_all.back().t1);