Skip to content

Commit

Permalink
whisper : fixed Beam Search Strategy and exposed whisper_pcm_to_mel_p…
Browse files Browse the repository at this point in the history
…hase_vocoder (ggerganov#474)

Co-authored-by: Sandro Hanea <[email protected]>
  • Loading branch information
sandrohanea and Sandro Hanea authored Feb 8, 2023
1 parent 4dd7119 commit 2bfe0eb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
4 changes: 2 additions & 2 deletions whisper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2905,7 +2905,7 @@ const char * whisper_print_system_info(void) {

struct whisper_full_params whisper_full_default_params(enum whisper_sampling_strategy strategy) {
struct whisper_full_params result = {
/*.strategy =*/ WHISPER_SAMPLING_GREEDY,
/*.strategy =*/ strategy,

/*.n_threads =*/ std::min(4, (int32_t) std::thread::hardware_concurrency()),
/*.n_max_text_ctx =*/ 16384,
Expand Down Expand Up @@ -3829,7 +3829,7 @@ int whisper_full(

auto & cur = beam_candidates[cur_c++];

while (beam_candidates[cur_c].sequence.sum_logprobs_all == cur.sequence.sum_logprobs_all && i > 0) {
while (beam_candidates.size() > cur_c && beam_candidates[cur_c].sequence.sum_logprobs_all == cur.sequence.sum_logprobs_all && i > 0) {
++cur_c;
}

Expand Down
10 changes: 10 additions & 0 deletions whisper.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,16 @@ extern "C" {
int n_samples,
int n_threads);

// Convert RAW PCM audio to log mel spectrogram but applies a Phase Vocoder to speed up the audio x2.
// The resulting spectrogram is stored inside the provided whisper context.
// Returns 0 on success
WHISPER_API int whisper_pcm_to_mel_phase_vocoder(
struct whisper_context* ctx,
const float* samples,
int n_samples,
int n_threads);


// This can be used to set a custom log mel spectrogram inside the provided whisper context.
// Use this instead of whisper_pcm_to_mel() if you want to provide your own log mel spectrogram.
// n_mel must be 80
Expand Down

0 comments on commit 2bfe0eb

Please sign in to comment.