Skip to content

fix: client lost the last segment of audio in online mode #3301

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

Open
dio-del wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −17
Open

fix: client lost the last segment of audio in online mode #3301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 20 additions & 17 deletions runtime/websocket/bin/websocket-server-2pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ context_ptr WebSocketServer::on_tls_init(tls_mode mode,
return ctx;
}

nlohmann::json handle_result(FUNASR_RESULT result, websocketpp::connection_hdl& hdl, std::map<websocketpp::connection_hdl, std::shared_ptr<FUNASR_MESSAGE>,std::owner_less<websocketpp::connection_hdl>>& data_map) {
nlohmann::json handle_result(FUNASR_RESULT result, websocketpp::connection_hdl& hdl, std::map<websocketpp::connection_hdl, std::shared_ptr<FUNASR_MESSAGE>,std::owner_less<websocketpp::connection_hdl>>& data_map, std::string modetype) {

@gemini-code-assist gemini-code-assist Bot Jul 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Passing std::string by value can result in unnecessary copy operations. It is more efficient to pass it by const std::string& to avoid copying the string on every call.

Suggested change
nlohmann::json handle_result(FUNASR_RESULT result, websocketpp::connection_hdl& hdl, std::map<websocketpp::connection_hdl, std::shared_ptr<FUNASR_MESSAGE>,std::owner_less<websocketpp::connection_hdl>>& data_map, std::string modetype) {
nlohmann::json handle_result(FUNASR_RESULT result, websocketpp::connection_hdl& hdl, std::map<websocketpp::connection_hdl, std::shared_ptr<FUNASR_MESSAGE>,std::owner_less<websocketpp::connection_hdl>>& data_map, const std::string& modetype) {

std::shared_ptr<FUNASR_MESSAGE> data_msg = nullptr;
auto it = data_map.find(hdl);
if (it != data_map.end()) {
Expand Down Expand Up @@ -95,20 +95,23 @@ nlohmann::json handle_result(FUNASR_RESULT result, websocketpp::connection_hdl&
data_msg->end_time = FunASRGetTpassEnd(result); // 记录句子的结束时间
jsonresult["timestamp"] = data_msg->timestamp;

std::string tmp_tpass_msg = FunASRGetTpassResult(result, 0);
if (tmp_tpass_msg != "") {
LOG(INFO) << "wav_name: " << data_msg->msg["wav_name"].get<std::string>() << " | offline results : " << tmp_tpass_msg;
jsonresult["text"] = tmp_tpass_msg;
jsonresult["mode"] = "2pass-offline";

// 句子结束，记录结束时间
jsonresult["start_time"] = data_msg->start_time;
jsonresult["end_time"] = data_msg->end_time;
jsonresult["slice_type"] = 2;
jsonresult["index"] = data_msg->index;

data_msg->index++; //句子序号
data_msg->is_sentence_started = false; // 重置句子状态
// online 模式跳过 offline 结果，避免覆盖 online 结果
if (modetype != "online") {
std::string tmp_tpass_msg = FunASRGetTpassResult(result, 0);
if (tmp_tpass_msg != "") {
Comment on lines +100 to +101

@gemini-code-assist gemini-code-assist Bot Jul 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The C-style API function FunASRGetTpassResult returns a const char* which could potentially be nullptr. Constructing a std::string directly from a nullptr results in undefined behavior and can cause a segmentation fault. It is safer to perform a null check before constructing the std::string.

Suggested change
std::string tmp_tpass_msg = FunASRGetTpassResult(result, 0);
if (tmp_tpass_msg != "") {
const char* tpass_res = FunASRGetTpassResult(result, 0);
std::string tmp_tpass_msg = tpass_res ? tpass_res : "";
if (!tmp_tpass_msg.empty()) {

LOG(INFO) << "wav_name: " << data_msg->msg["wav_name"].get<std::string>() << " | offline results : " << tmp_tpass_msg;
jsonresult["text"] = tmp_tpass_msg;
jsonresult["mode"] = "2pass-offline";

// 句子结束，记录结束时间
jsonresult["start_time"] = data_msg->start_time;
jsonresult["end_time"] = data_msg->end_time;
jsonresult["slice_type"] = 2;
jsonresult["index"] = data_msg->index;

data_msg->index++; //句子序号
data_msg->is_sentence_started = false; // 重置句子状态
}
}

std::string tmp_stamp_msg = FunASRGetStamp(result);
Expand Down Expand Up @@ -195,7 +198,7 @@ void WebSocketServer::do_decoder(
}
if (Result) {
websocketpp::lib::error_code ec;
nlohmann::json jsonresult = handle_result(Result, hdl, data_map);
nlohmann::json jsonresult = handle_result(Result, hdl, data_map, modetype);
jsonresult["wav_name"] = wav_name;
jsonresult["is_final"] = false;
if (jsonresult["text"] != "") {
Expand Down Expand Up @@ -238,7 +241,7 @@ void WebSocketServer::do_decoder(
}
if (Result) {
websocketpp::lib::error_code ec;
nlohmann::json jsonresult = handle_result(Result, hdl, data_map);
nlohmann::json jsonresult = handle_result(Result, hdl, data_map, modetype);
jsonresult["wav_name"] = wav_name;
jsonresult["is_final"] = true;
//LOG(INFO) << "jsonresult: " << jsonresult.dump(4);
Expand Down