amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

解决ws-flv和http-flv的累积时延问题(#2509)

Browse Source
This commit is contained in:
百鸣 2023-05-31 23:16:16 +08:00 committed by GitHub
parent 11a39c68c4
commit 14537bfbc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Http/HttpSession.cpp
View File

@ -148,8 +148,14 @@ bool HttpSession::checkWebSocket(){
sendResponse(101, false, nullptr, headerOut, nullptr, true);
};
auto res_cb_flv = [this, header = std::move(headerOut)]() mutable {
_live_over_websocket = true;
header.emplace("Cache-Control", "no-store");
sendResponse(101, false, nullptr, header, nullptr, true);
};
//判断是否为websocket-flv
if (checkLiveStreamFlv(res_cb)) {
if (checkLiveStreamFlv(res_cb_flv)) {
//这里是websocket-flv直播请求
return true;
}
@ -349,7 +355,9 @@ bool HttpSession::checkLiveStreamFlv(const function<void()> &cb){
assert(rtmp_src);
if (!cb) {
//找到源，发送http头，负载后续发送
sendResponse(200, false, HttpFileManager::getContentType(".flv").data(), KeyValue(), nullptr, true);
KeyValue headerOut;
headerOut["Cache-Control"] = "no-store";
sendResponse(200, false, HttpFileManager::getContentType(".flv").data(), headerOut, nullptr, true);
} else {
//自定义发送http头
cb();