Overlap analysis

CMakeLists.txt

@@ -86,12 +86,14 @@ target_sources(
   PRIVATE src/plugin-main.c
           src/transcription-filter.cpp
           src/transcription-filter.c
+          src/transcription-utils.cpp
           src/model-utils/model-downloader.cpp
           src/model-utils/model-downloader-ui.cpp
           src/model-utils/model-infos.cpp
           src/whisper-utils/whisper-processing.cpp
           src/whisper-utils/whisper-utils.cpp
           src/whisper-utils/silero-vad-onnx.cpp
+          src/whisper-utils/token-buffer-thread.cpp
           src/translation/translation.cpp
           src/utils.cpp)
 

cmake/BuildWhispercpp.cmake

@@ -107,12 +107,12 @@ elseif(WIN32)
   install(FILES ${WHISPER_DLLS} DESTINATION "obs-plugins/64bit")
 
 else()
-  set(Whispercpp_Build_GIT_TAG "f22d27a385d34b1e544031efe8aa2e3d73922791")
+  set(Whispercpp_Build_GIT_TAG "7395c70a748753e3800b63e3422a2b558a097c80")
   set(WHISPER_EXTRA_CXX_FLAGS "-fPIC")
   set(WHISPER_ADDITIONAL_CMAKE_ARGS -DWHISPER_BLAS=OFF -DWHISPER_CUBLAS=OFF -DWHISPER_OPENBLAS=OFF -DWHISPER_NO_AVX=ON
                                     -DWHISPER_NO_AVX2=ON)
 
-  # On Linux and MacOS build a static Whisper library
+  # On Linux build a static Whisper library
   ExternalProject_Add(
     Whispercpp_Build
     DOWNLOAD_EXTRACT_TIMESTAMP true
@@ -133,7 +133,7 @@ else()
 
   ExternalProject_Get_Property(Whispercpp_Build INSTALL_DIR)
 
-  # on Linux and MacOS add the static Whisper library to the link line
+  # add the static Whisper library to the link line
   add_library(Whispercpp::Whisper STATIC IMPORTED)
   set_target_properties(
     Whispercpp::Whisper

data/locale/en-US.ini

@@ -51,3 +51,7 @@ translate_add_context="Translate with context"
 whisper_translate="Translate to English (Whisper)"
 buffer_size_msec="Buffer size (ms)"
 overlap_size_msec="Overlap size (ms)"
+suppress_sentences="Suppress sentences (each line)"
+translate_output="Translation output"
+dtw_token_timestamps="DTW token timestamps"
+buffered_output="Buffered output (Experimental)"

src/transcription-filter-data.h

@@ -17,25 +17,13 @@
 
 #include "translation/translation.h"
 #include "whisper-utils/silero-vad-onnx.h"
-#include "captions-thread.h"
+#include "whisper-utils/whisper-processing.h"
+#include "whisper-utils/token-buffer-thread.h"
 
 #define MAX_PREPROC_CHANNELS 10
 
 #define MT_ obs_module_text
 
-enum DetectionResult {
-	DETECTION_RESULT_UNKNOWN = 0,
-	DETECTION_RESULT_SILENCE = 1,
-	DETECTION_RESULT_SPEECH = 2,
-};
-
-struct DetectionResultWithText {
-	DetectionResult result;
-	std::string text;
-	uint64_t start_timestamp_ms;
-	uint64_t end_timestamp_ms;
-};
-
 struct transcription_filter_data {
 	obs_source_t *context; // obs filter source (this filter)
 	size_t channels;       // number of channels
@@ -64,7 +52,7 @@ struct transcription_filter_data {
 	struct circlebuf input_buffers[MAX_PREPROC_CHANNELS];
 
 	/* Resampler */
-	audio_resampler_t *resampler;
+	audio_resampler_t *resampler_to_whisper;
 
 	/* whisper */
 	std::string whisper_model_path;
@@ -90,15 +78,16 @@ struct transcription_filter_data {
 	bool translate = false;
 	std::string source_lang;
 	std::string target_lang;
+	std::string translation_output;
 	bool buffered_output = false;
+	bool enable_token_ts_dtw = false;
+	std::string suppress_sentences;
 
 	// Last transcription result
 	std::string last_text;
 
 	// Text source to output the subtitles
-	obs_weak_source_t *text_source;
-	char *text_source_name;
-	std::mutex *text_source_mutex;
+	std::string text_source_name;
 	// Callback to set the text in the output text source (subtitles)
 	std::function<void(const DetectionResultWithText &result)> setTextCallback;
 	// Output file path to write the subtitles
@@ -115,7 +104,7 @@ struct transcription_filter_data {
 	// translation context
 	struct translation_context translation_ctx;
 
-	CaptionMonitor captions_monitor;
+	TokenBufferThread captions_monitor;
 
 	// ctor
 	transcription_filter_data()
@@ -125,11 +114,9 @@ struct transcription_filter_data {
 			copy_buffers[i] = nullptr;
 		}
 		context = nullptr;
-		resampler = nullptr;
+		resampler_to_whisper = nullptr;
 		whisper_model_path = "";
 		whisper_context = nullptr;
-		text_source = nullptr;
-		text_source_mutex = nullptr;
 		whisper_buf_mutex = nullptr;
 		whisper_ctx_mutex = nullptr;
 		wshiper_thread_cv = nullptr;