add get_result

Author: litongmacos

common/utils.cpp

@@ -6,6 +6,9 @@
 #include <string>
 #include <sstream>
 #include <iomanip>
+#include <whisper.h>
+#include "../nlohmann/json.hpp"
+
 
 std::string get_current_time() {
   auto now = std::chrono::system_clock::now();
@@ -23,4 +26,23 @@ std::string get_current_time() {
 long get_current_time_millis(){
   auto start = std::chrono::system_clock::now();
   return std::chrono::duration_cast<std::chrono::milliseconds>(start.time_since_epoch()).count();
-}
+}
+
+nlohmann::json get_result(whisper_context *ctx) {
+  nlohmann::json results = nlohmann::json(nlohmann::json::array());
+  const int n_segments = whisper_full_n_segments(ctx);
+  for (int i = 0; i < n_segments; ++i) {
+    nlohmann::json segment;
+    int64_t t0 = whisper_full_get_segment_t0(ctx, i);
+    int64_t t1 = whisper_full_get_segment_t1(ctx, i);
+    const char *sentence = whisper_full_get_segment_text(ctx, i);
+    auto result = std::to_string(t0) + "-->" + std::to_string(t1) + ":" + sentence + "\n";
+    printf("%s: result:%s\n", get_current_time().c_str(), result.c_str());
+    segment["t0"] = t0;
+    segment["t1"] = t1;
+    segment["sentence"] = sentence;
+    results.push_back(segment);
+  }
+  return results;
+}
+

common/utils.h

@@ -1,6 +1,9 @@
 #pragma once
 
 #include <iostream>
+#include <whisper.h>
+#include "../nlohmann/json.hpp"
 
 std::string get_current_time();
-long get_current_time_millis();
+long get_current_time_millis();
+nlohmann::json get_result(whisper_context *ctx);

handler/inference_handler.cpp

@@ -410,10 +410,10 @@ void handleInference(const Request &request, Response &response, std::mutex &whi
     }
       // TODO add more output formats
     else {
-      std::string results = output_str(ctx, params, pcmf32s);
+      auto results = get_result(ctx);
       json jres = json{
         {"code",0},
-        {"text", results}
+        {"data", results}
       };
       response.set_content(jres.dump(-1, ' ', false, json::error_handler_t::replace),
                            "application/json");

whisper_server_base_on_uwebsockets.cpp

@@ -10,7 +10,6 @@
 #include <sstream>
 
 using namespace stream_components;
-nlohmann::json getResult(whisper_context *ctx);
 bool processAudio(WhisperService service, std::vector<float> pcm32, const whisper_local_stream_params& params);
 
 int main(int argc, char **argv) {
@@ -155,7 +154,7 @@ int main(int argc, char **argv) {
             isOk= whisperService.process(pcm32.data(), pcm32.size());
           }
           if (isOk) {
-            final_results = getResult(whisperService.ctx);
+            final_results = get_result(whisperService.ctx);
             response["result"] = final_results;
           }
           ws->send(response.dump(), uWS::OpCode::TEXT);
@@ -236,22 +235,6 @@ bool processAudio(WhisperService whisperService, std::vector<float> pcm32, const
   }
 }
 
-nlohmann::json getResult(whisper_context *ctx) {
-  nlohmann::json results = nlohmann::json(nlohmann::json::array());
-  const int n_segments = whisper_full_n_segments(ctx);
-  for (int i = 0; i < n_segments; ++i) {
-    nlohmann::json segment;
-    int64_t t0 = whisper_full_get_segment_t0(ctx, i);
-    int64_t t1 = whisper_full_get_segment_t1(ctx, i);
-    const char *sentence = whisper_full_get_segment_text(ctx, i);
-    auto result = std::to_string(t0) + "-->" + std::to_string(t1) + ":" + sentence + "\n";
-    printf("%s: result:%s\n", get_current_time().c_str(), result.c_str());
-    segment["t0"] = t0;
-    segment["t1"] = t1;
-    segment["sentence"] = sentence;
-    results.push_back(segment);
-  }
-  return results;
-}
+