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

Fix compilation error issues (#3385)

Browse Source
This commit is contained in:
ljx0305 2024-03-22 20:42:02 +08:00 committed by GitHub
parent 12d9351666
commit 66a6253160
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/VideoStack.cpp
View File

@ -180,7 +180,7 @@ void StackPlayer::play()
self->onFrame(frame); self->onFrame(frame);
}); });
videoTrack->addDelegate((std::function<bool(const mediakit::Frame::Ptr&)>)[decoder](const mediakit::Frame::Ptr& frame) { videoTrack->addDelegate([decoder](const mediakit::Frame::Ptr& frame) {
return decoder->inputFrame(frame, false, true); return decoder->inputFrame(frame, false, true);
}); });
} }
@ -467,8 +467,8 @@ Params VideoStackManager::parseParams(const Json::Value& json,
float gaph = json["gaph"].asFloat(); //水平间距 float gaph = json["gaph"].asFloat(); //水平间距
//单个间距 //单个间距
int gaphPix = static_cast<int>(std::round(width * gaph)); int gaphPix = static_cast<int>(round(width * gaph));
int gapvPix = static_cast<int>(std::round(height * gapv)); int gapvPix = static_cast<int>(round(height * gapv));
// 根据间距计算格子宽高 // 根据间距计算格子宽高
int gridWidth = cols > 1 ? (width - gaphPix * (cols - 1)) / cols : width; int gridWidth = cols > 1 ? (width - gaphPix * (cols - 1)) / cols : width;

2
server/WebApi.h
View File

@ -234,8 +234,6 @@ void unInstallWebApi();
#if defined(ENABLE_RTPPROXY) #if defined(ENABLE_RTPPROXY)
uint16_t openRtpServer(uint16_t local_port, const std::string &stream_id, int tcp_mode, const std::string &local_ip, bool re_use_port, uint32_t ssrc, int only_track, bool multiplex=false); uint16_t openRtpServer(uint16_t local_port, const std::string &stream_id, int tcp_mode, const std::string &local_ip, bool re_use_port, uint32_t ssrc, int only_track, bool multiplex=false);
void connectRtpServer(const std::string &stream_id, const std::string &dst_url, uint16_t dst_port, const std::function<void(const toolkit::SockException &ex)> &cb);
bool closeRtpServer(const std::string &stream_id);
#endif #endif
Json::Value makeMediaSourceJson(mediakit::MediaSource &media); Json::Value makeMediaSourceJson(mediakit::MediaSource &media);