lywsvip/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-05-07 07:37:12 +08:00
Code Issues 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
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/VideoStack.cpp
View File

@@ -180,7 +180,7 @@ void StackPlayer::play()
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);
});
}
@@ -467,8 +467,8 @@ Params VideoStackManager::parseParams(const Json::Value& json,
float gaph = json["gaph"].asFloat(); //水平间距
//单个间距
int gaphPix = static_cast<int>(std::round(width * gaph));
int gapvPix = static_cast<int>(std::round(height * gapv));
int gaphPix = static_cast<int>(round(width * gaph));
int gapvPix = static_cast<int>(round(height * gapv));
// 根据间距计算格子宽高
int gridWidth = cols > 1 ? (width - gaphPix * (cols - 1)) / cols : width;
@@ -587,4 +587,4 @@ StackPlayer::Ptr VideoStackManager::createPlayer(const std::string& id)
return player;
}
#endif
#endif