Skip to content

fix[notask]: replace global streaming state with per-instance map in whispercpp #1079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sharmaraju352 merged 2 commits into from
Mar 24, 2026
Merged

fix[notask]: replace global streaming state with per-instance map in whispercpp #1079

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b50c816
fix[notask]: replace global streaming state with per-instance map in …
Mar 23, 2026
0cfd15e
Merge branch 'main' into fix/whispercpp-streaming-per-instance
sharmaraju352 Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions packages/qvac-lib-infer-whispercpp/addon/src/addon/AddonJs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <mutex>
#include <span>
#include <string>
#include <unordered_map>
#include <vector>

#include <js.h>
Expand All @@ -25,8 +26,9 @@
namespace qvac_lib_inference_addon_whisper {

inline std::mutex g_streamingMtx;
inline qvac_lib_inference_addon_cpp::AddonJs* g_streamingInstance = nullptr;
inline std::unique_ptr<StreamingProcessor> g_streamingProcessor;
inline std::unordered_map<
qvac_lib_inference_addon_cpp::AddonJs*,
std::unique_ptr<StreamingProcessor>> g_streamingSessions;

namespace js = qvac_lib_inference_addon_cpp::js;
using qvac_lib_inference_addon_cpp::OutputQueue;
Expand Down Expand Up @@ -245,15 +247,14 @@ startStreaming(js_env_t* env, js_callback_info_t* info) try {
{
std::lock_guard lock(g_streamingMtx);

if (g_streamingProcessor) {
if (g_streamingSessions.count(&instance) != 0) {
throw std::runtime_error(
"Streaming session already active");
"Streaming session already active for this instance");
}

auto& whisperModel =
dynamic_cast<WhisperModel&>(instance.addonCpp->model.get());
g_streamingInstance = &instance;
g_streamingProcessor = std::make_unique<StreamingProcessor>(
g_streamingSessions[&instance] = std::make_unique<StreamingProcessor>(
whisperModel,
instance.addonCpp->outputQueue,
config);
Expand Down Expand Up @@ -296,10 +297,11 @@ appendStreamingAudio(js_env_t* env, js_callback_info_t* info) try {
StreamingProcessor* processor = nullptr;
{
std::lock_guard lock(g_streamingMtx);
if (!g_streamingProcessor || g_streamingInstance != &instance) {
auto it = g_streamingSessions.find(&instance);
if (it == g_streamingSessions.end()) {
throw std::runtime_error("No active streaming session for this instance");
}
processor = g_streamingProcessor.get();
processor = it->second.get();
}

processor->appendAudio(std::move(samples));
Expand All @@ -316,11 +318,12 @@ cleanupStreamingSession(
std::unique_ptr<StreamingProcessor> processor;
{
std::lock_guard lock(g_streamingMtx);
if (!g_streamingProcessor || g_streamingInstance != &instance) {
auto it = g_streamingSessions.find(&instance);
if (it == g_streamingSessions.end()) {
return false;
}
processor = std::move(g_streamingProcessor);
g_streamingInstance = nullptr;
processor = std::move(it->second);
g_streamingSessions.erase(it);
}
if (forceful) {
processor->cancel();
Expand All @@ -340,10 +343,11 @@ cancelWithStreaming(js_env_t* env, js_callback_info_t* info) try {
std::shared_ptr<StreamingProcessor> processor;
{
std::lock_guard lock(g_streamingMtx);
if (g_streamingProcessor && g_streamingInstance == &instance) {
auto it = g_streamingSessions.find(&instance);
if (it != g_streamingSessions.end()) {
processor = std::shared_ptr<StreamingProcessor>(
std::move(g_streamingProcessor));
g_streamingInstance = nullptr;
std::move(it->second));
g_streamingSessions.erase(it);
}
}

Expand Down
Loading