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

适配最新zltoolkit

Browse Source
This commit is contained in:
ziyue 2021-10-22 16:43:34 +08:00
parent fafd197e2b
commit fcfa13b0fe
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

@ -1 +1 @@
Subproject commit 7923e9646f1779d8ce8f256c7f9c0a5bee69e7d7 Subproject commit 2fe11e250eeec2e79ee210b89a7f1a78f6d40630

2
3rdpart/media-server

@ -1 +1 @@
Subproject commit 0caa03c07e2ed40ec996479d594f1a75e9bd3f03 Subproject commit 6ac21f845567afe7256709764373cbc3dc8d57ad

11
src/Http/WebSocketClient.h
View File

@ -368,18 +368,19 @@ public:
* 目的是替换TcpClient的连接服务器行为，使之先完成WebSocket握手 * 目的是替换TcpClient的连接服务器行为，使之先完成WebSocket握手
* @param host websocket服务器ip或域名 * @param host websocket服务器ip或域名
* @param iPort websocket服务器端口 * @param iPort websocket服务器端口
* @param fTimeOutSec 超时时间 * @param timeout_sec 超时时间
* @param local_port 本地监听端口，此处不起作用
*/ */
void startConnect(const string &host, uint16_t iPort, float fTimeOutSec = 3) override { void startConnect(const string &host, uint16_t port, float timeout_sec = 3, uint16_t local_port = 0) override {
string ws_url; string ws_url;
if (useWSS) { if (useWSS) {
//加密的ws //加密的ws
ws_url = StrPrinter << "wss://" + host << ":" << iPort << "/" ; ws_url = StrPrinter << "wss://" + host << ":" << port << "/";
} else { } else {
//明文ws //明文ws
ws_url = StrPrinter << "ws://" + host << ":" << iPort << "/" ; ws_url = StrPrinter << "ws://" + host << ":" << port << "/";
} }
_wsClient->startWsClient(ws_url,fTimeOutSec); _wsClient->startWsClient(ws_url, timeout_sec);
} }
void startWebSocket(const string &ws_url,float fTimeOutSec = 3){ void startWebSocket(const string &ws_url,float fTimeOutSec = 3){

7
src/Record/MP4Recorder.cpp
View File

@ -72,13 +72,8 @@ void MP4Recorder::asyncClose() {
info.time_len = (float) (::time(NULL) - info.start_time); info.time_len = (float) (::time(NULL) - info.start_time);
//关闭mp4非常耗时，所以要放在后台线程执行 //关闭mp4非常耗时，所以要放在后台线程执行
muxer->closeMP4(); muxer->closeMP4();
//获取文件大小 //获取文件大小
auto fp = fopen(full_path_tmp.data(), "rb"); info.file_size = File::fileSize(full_path_tmp.data());
assert(fp);
info.file_size = File::fileSize(fp);
fclose(fp);
if (info.file_size < 1024) { if (info.file_size < 1024) {
//录像文件太小，删除之 //录像文件太小，删除之
File::delete_file(full_path_tmp.data()); File::delete_file(full_path_tmp.data());