fix merging mistakes.

Author: bygreencn

cmake/build-info.cmake

@@ -42,6 +42,8 @@ endif()
 if(MSVC)
     set(BUILD_COMPILER "${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}")
     set(BUILD_TARGET ${CMAKE_VS_PLATFORM_NAME})
+    add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
+    add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
 else()
     execute_process(
         COMMAND sh -c "$@ --version | head -1" _ ${CMAKE_C_COMPILER}

examples/CMakeLists.txt

@@ -88,11 +88,6 @@ if (WHISPER_SDL2)
     set_target_properties(${TARGET} PROPERTIES FOLDER "libs")
 endif()
 
-<<<<<<<<< Temporary merge branch 1
-add_library(json_cpp INTERFACE)
-target_include_directories(json_cpp INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
-
-
 
 # Get all propreties that cmake supports
 if(NOT CMAKE_PROPERTY_LIST)
@@ -230,7 +225,7 @@ elseif(CMAKE_JS_VERSION)
     set_target_properties(addon.node PROPERTIES FOLDER "examples")
 else()
     add_subdirectory(main)
-<<<<<<<<< Temporary merge branch 1
+
 if (WHISPER_SDL2)
     #set_target_properties(stream PROPERTIES FOLDER "examples")
 endif (WHISPER_SDL2)
@@ -249,12 +244,11 @@ if (WHISPER_SDL2)
     #set_target_properties(talk PROPERTIES FOLDER "examples")
     #set_target_properties(talk-llama PROPERTIES FOLDER "examples")
     set_target_properties(main PROPERTIES FOLDER "examples")
+endif (WHISPER_SDL2)
 if (WHISPER_SDL2)
     add_subdirectory(stream)
     set_target_properties(stream PROPERTIES FOLDER "examples")
 endif (WHISPER_SDL2)
-    add_subdirectory(stream-portaudio)
-    set_target_properties(stream-portaudio PROPERTIES FOLDER "examples")
 if (WHISPER_SDL2)
     add_subdirectory(command)
     set_target_properties(command PROPERTIES FOLDER "examples")

examples/common-portaudio.h

@@ -33,15 +33,14 @@ using namespace std;
 #include <vector>
 #include <mutex>
 #include <condition_variable>
-#include <cstring>  // 用于memcpy
+#include <cstring>  // memcpy
 
 
 template <typename T>
 class CircularQueue {
 public:
     explicit CircularQueue(size_t capacity) : capacity_(capacity), queue_(capacity){}
 
-    // 阻塞连续块写入
 public:
     bool enqueue(const void* pdata, size_t blockSize) {
         int retry = 2;
@@ -51,35 +50,30 @@ class CircularQueue {
         //std::cout << readIndex_ << " " << writeIndex_ << std::endl;
         //std::cout << size_ << std::endl;
 
-        // 使用lambda函数来判断容量是否足够
         auto isCapacityEnough = [&]() {
-            return ((capacity_-size_) >= blockSize);
+            return ((capacity_ - size_) >= blockSize);
         };
 
-
         volatile bool status = conditionVariable_.wait_for(lock, std::chrono::microseconds(100), isCapacityEnough);
-
         if (status == false)
         {
             lock.unlock();
             std::cout << "[enqueue] timeout" << std::endl;
             return false;
         }
 
-        // 执行连续写入
         size_t remainingSpace = capacity_ - writeIndex_;
         size_t dataSize = blockSize * sizeof(T);
 
         if (dataSize <= remainingSpace * sizeof(T)) {
-            // 数据不跨越队列尾部
             std::memcpy(&queue_[writeIndex_], pdata, dataSize);
-        } else {
-            // 数据跨越队列尾部
+        }
+        else {
             size_t firstPartSize = remainingSpace * sizeof(T);
-            std::memcpy(&queue_[writeIndex_], (char *)pdata, firstPartSize);
+            std::memcpy(&queue_[writeIndex_], (char*)pdata, firstPartSize);
 
             size_t secondPartSize = dataSize - firstPartSize;
-            std::memcpy(&queue_[0], (char *)((T *)pdata + remainingSpace), secondPartSize);
+            std::memcpy(&queue_[0], (char*)((T*)pdata + remainingSpace), secondPartSize);
         }
 
         writeIndex_ = (writeIndex_ + blockSize) % capacity_;
@@ -89,20 +83,18 @@ class CircularQueue {
         //std::cout << "After enqueue" << std::endl;
         //std::cout << readIndex_ << " " << writeIndex_ << std::endl;
         //std::cout << size_ << std::endl;
-        conditionVariable_.notify_one();  // 通知读取线程数据已经可用
+        conditionVariable_.notify_one();  
 
         return true;
-    }
+    };
 
-    // 阻塞连续块读出
     bool dequeue(void* pdata, size_t blockSize) {
         std::unique_lock<std::mutex> lock(mutex_);
 
         //std::cout << "Before dequeue" << std::endl;
         //std::cout << readIndex_ << " " << writeIndex_ << std::endl;
         //std::cout << size_ << std::endl;
 
-        // 使用lambda函数来判断容量是否足够
         auto isCapacityEnough = [&]() {
             return size_ >= blockSize;
         };
@@ -120,10 +112,8 @@ class CircularQueue {
         size_t dataSize = blockSize * sizeof(T);
 
         if (dataSize <= remainingData * sizeof(T)) {
-            // 数据不跨越队列尾部
             std::memcpy((char *)pdata, &queue_[readIndex_], dataSize);
         } else {
-            // 数据跨越队列尾部
             size_t firstPartSize = remainingData * sizeof(T);
             std::memcpy((char *)pdata, &queue_[readIndex_], firstPartSize);
 
@@ -138,24 +128,21 @@ class CircularQueue {
         //std::cout << "After dequeue" << std::endl;
         //std::cout << readIndex_ << " " << writeIndex_ << std::endl;
         //std::cout << size_ << std::endl;
-        conditionVariable_.notify_one();  // 通知写入线程队列有足够空间
+        conditionVariable_.notify_one();  
 
         return true;
     }
 
-    // 判断队列是否为空
     bool empty() {
         std::unique_lock<std::mutex> lock(mutex_);
         return size_ == 0;
     }
 
-    // 判断队列是否已满
     bool full() {
         std::unique_lock<std::mutex> lock(mutex_);
         return size_ == capacity_;
     }
 
-    // 获取队列中元素的数量
     size_t size() {
         std::unique_lock<std::mutex> lock(mutex_);
         return size_;

examples/main/main.cpp

@@ -52,7 +52,6 @@ struct whisper_params {
     bool detect_language = false;
     bool diarize         = false;
     bool tinydiarize     = false;
-    bool split_on_word   = false;
     bool no_fallback     = false;
     bool output_txt      = false;
     bool output_vtt      = false;
@@ -141,7 +140,6 @@ static bool whisper_params_parse(int argc, char ** argv, whisper_params & params
         else if (arg == "-tr"   || arg == "--translate")       { params.translate       = true; }
         else if (arg == "-di"   || arg == "--diarize")         { params.diarize         = true; }
         else if (arg == "-tdrz" || arg == "--tinydiarize")     { params.tinydiarize     = true; }
-        else if (arg == "-sow"  || arg == "--split-on-word")   { params.split_on_word   = true; }
         else if (arg == "-nf"   || arg == "--no-fallback")     { params.no_fallback     = true; }
         else if (arg == "-otxt" || arg == "--output-txt")      { params.output_txt      = true; }
         else if (arg == "-ovtt" || arg == "--output-vtt")      { params.output_vtt      = true; }
@@ -195,7 +193,6 @@ static void whisper_print_usage(int /*argc*/, char ** argv, const whisper_params
     fprintf(stderr, "  -d  N,     --duration N        [%-7d] duration of audio to process in milliseconds\n",   params.duration_ms);
     fprintf(stderr, "  -mc N,     --max-context N     [%-7d] maximum number of text context tokens to store\n", params.max_context);
     fprintf(stderr, "  -ml N,     --max-len N         [%-7d] maximum segment length in characters\n",           params.max_len);
-    fprintf(stderr, "  -sow,      --split-on-word     [%-7s] split on word rather than on token\n",             params.split_on_word ? "true" : "false");
     fprintf(stderr, "  -bo N,     --best-of N         [%-7d] number of best candidates to keep\n",              params.best_of);
     fprintf(stderr, "  -bs N,     --beam-size N       [%-7d] beam size for beam search\n",                      params.beam_size);
     fprintf(stderr, "  -ac N,     --audio-ctx N       [%-7d] audio context size (0 - all)\n",                   params.audio_ctx);
@@ -1101,7 +1098,6 @@ int main(int argc, char ** argv) {
             wparams.token_timestamps = params.output_wts || params.output_jsn_full || params.max_len > 0;
             wparams.thold_pt         = params.word_thold;
             wparams.max_len          = params.output_wts && params.max_len == 0 ? 60 : params.max_len;
-            wparams.split_on_word    = params.split_on_word;
             wparams.audio_ctx        = params.audio_ctx;
 
             wparams.debug_mode       = params.debug_mode;