Skip to content

Commit

Permalink
Revert some changes
Browse files Browse the repository at this point in the history
  • Loading branch information
bobqianic authored Jan 15, 2024
1 parent 80589d2 commit 271c321
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 4 deletions.
7 changes: 5 additions & 2 deletions examples/addon.node/addon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ int run(whisper_params &params, std::vector<std::vector<std::string>> &result) {

wparams.strategy = params.beam_size > 1 ? WHISPER_SAMPLING_BEAM_SEARCH : WHISPER_SAMPLING_GREEDY;

wparams.print_realtime = false;
wparams.print_progress = params.print_progress;
wparams.print_timestamps = !params.no_timestamps;
wparams.print_special = params.print_special;
Expand All @@ -234,8 +235,10 @@ int run(whisper_params &params, std::vector<std::vector<std::string>> &result) {
whisper_print_user_data user_data = { &params, &pcmf32s };

// this callback is called on each new segment
wparams.new_segment_callback = whisper_print_segment_callback;
wparams.new_segment_callback_user_data = &user_data;
if (!wparams.print_realtime) {
wparams.new_segment_callback = whisper_print_segment_callback;
wparams.new_segment_callback_user_data = &user_data;
}

// example for abort mechanism
// in this example, we do not abort the processing, but we could if the flag is set to true
Expand Down
1 change: 1 addition & 0 deletions examples/command.wasm/emscripten.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ void command_main(size_t index) {
wparams.translate = false;
wparams.no_context = true;
wparams.single_segment = true;
wparams.print_realtime = false;
wparams.print_progress = false;
wparams.print_timestamps = true;
wparams.print_special = false;
Expand Down
2 changes: 2 additions & 0 deletions examples/command/command.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ std::string transcribe(

wparams.print_progress = false;
wparams.print_special = params.print_special;
wparams.print_realtime = false;
wparams.print_timestamps = !params.no_timestamps;
wparams.translate = params.translate;
wparams.no_context = true;
Expand Down Expand Up @@ -356,6 +357,7 @@ int process_command_list(struct whisper_context * ctx, audio_async &audio, const

wparams.print_progress = false;
wparams.print_special = params.print_special;
wparams.print_realtime = false;
wparams.print_timestamps = !params.no_timestamps;
wparams.translate = params.translate;
wparams.no_context = true;
Expand Down
2 changes: 2 additions & 0 deletions examples/lsp/lsp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ json unguided_transcription(struct whisper_context * ctx, audio_async &audio, js
}
wparams.print_progress = false;
wparams.print_special = params.print_special;
wparams.print_realtime = false;
wparams.print_timestamps = false;
wparams.translate = params.translate;
wparams.no_context = jparams.value("no_context", true);
Expand Down Expand Up @@ -209,6 +210,7 @@ json guided_transcription(struct whisper_context * ctx, audio_async &audio, cons

wparams.print_progress = false;
wparams.print_special = params.print_special;
wparams.print_realtime = false;
wparams.print_timestamps = false;
wparams.translate = params.translate;
wparams.no_context = true;
Expand Down
7 changes: 5 additions & 2 deletions examples/main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -995,6 +995,7 @@ int run(int argc, const char ** argv) {

wparams.strategy = params.beam_size > 1 ? WHISPER_SAMPLING_BEAM_SEARCH : WHISPER_SAMPLING_GREEDY;

wparams.print_realtime = false;
wparams.print_progress = params.print_progress;
wparams.print_timestamps = !params.no_timestamps;
wparams.print_special = params.print_special;
Expand Down Expand Up @@ -1030,8 +1031,10 @@ int run(int argc, const char ** argv) {
whisper_print_user_data user_data = { &params, &pcmf32s, 0 };

// this callback is called on each new segment
wparams.new_segment_callback = whisper_print_segment_callback;
wparams.new_segment_callback_user_data = &user_data;
if (!wparams.print_realtime) {
wparams.new_segment_callback = whisper_print_segment_callback;
wparams.new_segment_callback_user_data = &user_data;
}

if (wparams.print_progress) {
wparams.progress_callback = whisper_print_progress_callback;
Expand Down
1 change: 1 addition & 0 deletions examples/server/server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,7 @@ int main(int argc, char ** argv) {

wparams.strategy = params.beam_size > 1 ? WHISPER_SAMPLING_BEAM_SEARCH : WHISPER_SAMPLING_GREEDY;

wparams.print_realtime = false;
wparams.print_progress = params.print_progress;
wparams.print_timestamps = !params.no_timestamps;
wparams.print_special = params.print_special;
Expand Down
1 change: 1 addition & 0 deletions examples/stream.wasm/emscripten.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ void stream_main(size_t index) {
wparams.translate = false;
wparams.no_context = true;
wparams.single_segment = true;
wparams.print_realtime = false;
wparams.print_progress = false;
wparams.print_timestamps = true;
wparams.print_special = false;
Expand Down
1 change: 1 addition & 0 deletions examples/stream/stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ int run(int argc, const char ** argv) {

wparams.print_progress = false;
wparams.print_special = params.print_special;
wparams.print_realtime = false;
wparams.print_timestamps = !params.no_timestamps;
wparams.translate = params.translate;
wparams.single_segment = !use_vad;
Expand Down
1 change: 1 addition & 0 deletions examples/talk-llama/talk-llama.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ std::string transcribe(

wparams.print_progress = false;
wparams.print_special = params.print_special;
wparams.print_realtime = false;
wparams.print_timestamps = !params.no_timestamps;
wparams.translate = params.translate;
wparams.no_context = true;
Expand Down
1 change: 1 addition & 0 deletions examples/talk.wasm/emscripten.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ void talk_main(size_t index) {
wparams.translate = false;
wparams.no_context = true;
wparams.single_segment = true;
wparams.print_realtime = false;
wparams.print_progress = false;
wparams.print_timestamps = true;
wparams.print_special = false;
Expand Down
1 change: 1 addition & 0 deletions examples/talk/talk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ std::string transcribe(whisper_context * ctx, const whisper_params & params, con

wparams.print_progress = false;
wparams.print_special = params.print_special;
wparams.print_realtime = false;
wparams.print_timestamps = !params.no_timestamps;
wparams.translate = params.translate;
wparams.no_context = true;
Expand Down
1 change: 1 addition & 0 deletions examples/wchess/wchess.cmd/wchess.cmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ int main(int argc, char ** argv) {
wparams.translate = false;
wparams.no_context = true;
wparams.single_segment = true;
wparams.print_realtime = false;
wparams.print_progress = false;
wparams.print_timestamps = true;
wparams.print_special = false;
Expand Down
1 change: 1 addition & 0 deletions examples/wchess/wchess.wasm/wchess.wasm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ void wchess_main(size_t i) {
wparams.translate = false;
wparams.no_context = true;
wparams.single_segment = true;
wparams.print_realtime = false;
wparams.print_progress = false;
wparams.print_timestamps = true;
wparams.print_special = false;
Expand Down

0 comments on commit 271c321

Please sign in to comment.