mirror of
https://github.com/ggerganov/whisper.cpp.git
synced 2024-12-21 13:37:47 +00:00
Prompt previous tokens for streaming (#163)
* feat: prompt previous tokens for streaming I used a vector pointer instead of vector itself because it gave weird errors, and why not * convert vector to use with C api * feat: remove old refs, check for prompt size * feat: use better way of getting the pointer
This commit is contained in:
parent
78116f8eda
commit
63ae03b8e0
@ -234,6 +234,7 @@ int main(int argc, char ** argv) {
|
|||||||
std::vector<float> pcmf32(n_samples_30s, 0.0f);
|
std::vector<float> pcmf32(n_samples_30s, 0.0f);
|
||||||
std::vector<float> pcmf32_old;
|
std::vector<float> pcmf32_old;
|
||||||
|
|
||||||
|
std::vector<whisper_token> prompt_tokens;
|
||||||
const int n_new_line = params.length_ms / params.step_ms - 1;
|
const int n_new_line = params.length_ms / params.step_ms - 1;
|
||||||
|
|
||||||
// print some info about the processing
|
// print some info about the processing
|
||||||
@ -344,6 +345,9 @@ int main(int argc, char ** argv) {
|
|||||||
wparams.audio_ctx = params.audio_ctx;
|
wparams.audio_ctx = params.audio_ctx;
|
||||||
wparams.speed_up = params.speed_up;
|
wparams.speed_up = params.speed_up;
|
||||||
|
|
||||||
|
wparams.prompt_tokens = prompt_tokens.data();
|
||||||
|
wparams.prompt_n_tokens = prompt_tokens.size();
|
||||||
|
|
||||||
if (whisper_full(ctx, wparams, pcmf32.data(), pcmf32.size()) != 0) {
|
if (whisper_full(ctx, wparams, pcmf32.data(), pcmf32.size()) != 0) {
|
||||||
fprintf(stderr, "%s: failed to process audio\n", argv[0]);
|
fprintf(stderr, "%s: failed to process audio\n", argv[0]);
|
||||||
return 6;
|
return 6;
|
||||||
@ -393,6 +397,16 @@ int main(int argc, char ** argv) {
|
|||||||
|
|
||||||
// keep part of the audio for next iteration to try to mitigate word boundary issues
|
// keep part of the audio for next iteration to try to mitigate word boundary issues
|
||||||
pcmf32_old = std::vector<float>(pcmf32.end() - n_samples_keep, pcmf32.end());
|
pcmf32_old = std::vector<float>(pcmf32.end() - n_samples_keep, pcmf32.end());
|
||||||
|
|
||||||
|
// Add tokens of the last full length segment as the prompt
|
||||||
|
prompt_tokens.clear();
|
||||||
|
const int n_segments = whisper_full_n_segments(ctx);
|
||||||
|
for (int i = 0; i < n_segments; ++i) {
|
||||||
|
const int token_count = whisper_full_n_tokens(ctx, i);
|
||||||
|
for (int j = 0; j < token_count; ++j) {
|
||||||
|
prompt_tokens.push_back(whisper_full_get_token_id(ctx, i, j));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
15
whisper.cpp
15
whisper.cpp
@ -2412,6 +2412,9 @@ struct whisper_full_params whisper_full_default_params(enum whisper_sampling_str
|
|||||||
/*.speed_up =*/ false,
|
/*.speed_up =*/ false,
|
||||||
/*.audio_ctx =*/ 0,
|
/*.audio_ctx =*/ 0,
|
||||||
|
|
||||||
|
/*.prompt_tokens =*/ nullptr,
|
||||||
|
/*.prompt_n_tokens =*/ 0,
|
||||||
|
|
||||||
/*.language =*/ "en",
|
/*.language =*/ "en",
|
||||||
|
|
||||||
/*.greedy =*/ {
|
/*.greedy =*/ {
|
||||||
@ -2455,6 +2458,9 @@ struct whisper_full_params whisper_full_default_params(enum whisper_sampling_str
|
|||||||
/*.speed_up =*/ false,
|
/*.speed_up =*/ false,
|
||||||
/*.audio_ctx =*/ 0,
|
/*.audio_ctx =*/ 0,
|
||||||
|
|
||||||
|
/*.prompt_tokens =*/ nullptr,
|
||||||
|
/*.prompt_n_tokens =*/ 0,
|
||||||
|
|
||||||
/*.language =*/ "en",
|
/*.language =*/ "en",
|
||||||
|
|
||||||
/*.greedy =*/ {
|
/*.greedy =*/ {
|
||||||
@ -2584,6 +2590,15 @@ int whisper_full(
|
|||||||
prompt_past.clear();
|
prompt_past.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Prepend the prompt tokens to the prompt_past
|
||||||
|
if (params.prompt_tokens && params.prompt_n_tokens > 0) {
|
||||||
|
// Parse tokens from the pointer (it points to an std::vector)
|
||||||
|
for (int i = 0; i < params.prompt_n_tokens; i++) {
|
||||||
|
prompt_past.push_back(params.prompt_tokens[i]);
|
||||||
|
}
|
||||||
|
std::rotate(prompt_past.begin(), prompt_past.end() - params.prompt_n_tokens, prompt_past.end());
|
||||||
|
}
|
||||||
|
|
||||||
// overwrite audio_ctx
|
// overwrite audio_ctx
|
||||||
ctx->exp_n_audio_ctx = params.audio_ctx;
|
ctx->exp_n_audio_ctx = params.audio_ctx;
|
||||||
|
|
||||||
|
@ -208,6 +208,10 @@ extern "C" {
|
|||||||
bool speed_up; // speed-up the audio by 2x using Phase Vocoder
|
bool speed_up; // speed-up the audio by 2x using Phase Vocoder
|
||||||
int audio_ctx; // overwrite the audio context size (0 = use default)
|
int audio_ctx; // overwrite the audio context size (0 = use default)
|
||||||
|
|
||||||
|
// std::vector<whisper_token>: tokens to provide the whisper model as initial prompt
|
||||||
|
const whisper_token * prompt_tokens;
|
||||||
|
int prompt_n_tokens;
|
||||||
|
|
||||||
const char * language;
|
const char * language;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
|
Loading…
Reference in New Issue
Block a user