mirrors/obs-localvocal
1
0
Fork 0
mirror of https://github.com/occ-ai/obs-localvocal synced 2024-11-07 18:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

guards on pointers

Browse Source
This commit is contained in:
Roy Shilkrot 2023-08-22 19:08:47 +03:00
parent f1a464a64d
commit 60a3cf0364
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/transcription-filter-data.h
View File

@ -53,18 +53,18 @@ struct transcription_filter_data {
bool active = false;
// Text source to output the subtitles
obs_weak_source_t *text_source;
char *text_source_name;
std::mutex *text_source_mutex;
obs_weak_source_t *text_source = nullptr;
char *text_source_name = nullptr;
std::mutex *text_source_mutex = nullptr;
// Callback to set the text in the output text source (subtitles)
std::function<void(const std::string &str)> setTextCallback;
// Use std for thread and mutex
std::thread whisper_thread;
std::mutex *whisper_buf_mutex;
std::mutex *whisper_ctx_mutex;
std::condition_variable *wshiper_thread_cv;
std::mutex *whisper_buf_mutex = nullptr;
std::mutex *whisper_ctx_mutex = nullptr;
std::condition_variable *wshiper_thread_cv = nullptr;
};
// Audio packet info

27
src/transcription-filter.cpp
View File

@ -68,6 +68,11 @@ struct obs_audio_data *transcription_filter_filter_audio(void *data, struct obs_
return audio;
}
if (!gf->whisper_buf_mutex || !gf->whisper_ctx_mutex) {
obs_log(LOG_ERROR, "whisper mutexes are null");
return audio;
}
{
std::lock_guard<std::mutex> lock(*gf->whisper_buf_mutex); // scoped lock
obs_log(gf->log_level,
@ -187,6 +192,10 @@ void transcription_filter_update(void *data, obs_data_t *s)
if (strcmp(text_source_name, "none") == 0 || strcmp(text_source_name, "(null)") == 0) {
// new selected text source is not valid, release the old one
if (gf->text_source) {
if (!gf->text_source_mutex) {
obs_log(LOG_ERROR, "text_source_mutex is null");
return;
}
std::lock_guard<std::mutex> lock(*gf->text_source_mutex);
old_weak_text_source = gf->text_source;
gf->text_source = nullptr;
@ -201,6 +210,10 @@ void transcription_filter_update(void *data, obs_data_t *s)
strcmp(text_source_name, gf->text_source_name) != 0) {
// new text source is different from the old one, release the old one
if (gf->text_source) {
if (!gf->text_source_mutex) {
obs_log(LOG_ERROR, "text_source_mutex is null");
return;
}
std::lock_guard<std::mutex> lock(*gf->text_source_mutex);
old_weak_text_source = gf->text_source;
gf->text_source = nullptr;
@ -223,6 +236,10 @@ void transcription_filter_update(void *data, obs_data_t *s)
obs_log(LOG_INFO, "model path changed, reloading model");
if (gf->whisper_context != nullptr) {
// acquire the mutex before freeing the context
if (!gf->whisper_ctx_mutex || !gf->wshiper_thread_cv) {
obs_log(LOG_ERROR, "whisper_ctx_mutex is null");
return;
}
std::lock_guard<std::mutex> lock(*gf->whisper_ctx_mutex);
whisper_free(gf->whisper_context);
gf->whisper_context = nullptr;
@ -254,6 +271,11 @@ void transcription_filter_update(void *data, obs_data_t *s)
}
}
if (!gf->whisper_ctx_mutex) {
obs_log(LOG_ERROR, "whisper_ctx_mutex is null");
return;
}
obs_log(LOG_INFO, "transcription_filter: update whisper params");
std::lock_guard<std::mutex> lock(*gf->whisper_ctx_mutex);
@ -345,6 +367,11 @@ void *transcription_filter_create(obs_data_t *settings, obs_source_t *filter)
obs_log(LOG_INFO, "transcription_filter: setup callback");
// set the callback to set the text in the output text source (subtitles)
gf->setTextCallback = [gf](const std::string &str) {
if (!gf->text_source_mutex) {
obs_log(LOG_ERROR, "text_source_mutex is null");
return;
}
if (!gf->text_source) {
// attempt to acquire a weak ref to the text source if it's yet available
acquire_weak_text_source_ref(gf);