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

修复video stack相关功能bug
Some checks are pending
Android / build (push) Waiting to run
Details
CodeQL / Analyze (cpp) (push) Waiting to run
Details
CodeQL / Analyze (javascript) (push) Waiting to run
Details
Docker / build (push) Waiting to run
Details
Linux / build (push) Waiting to run
Details
macOS / build (push) Waiting to run
Details
Windows / build (push) Waiting to run
Details

Browse Source 
/index/api/stack/reset 在相同url和通分辨率多次调用channel析构没画面的问题
是在 VideoStackManager::parseParams 函数里 多次 (*params)[i * cols + j] =
nullptr; 导致 channel 计数器为0，析构没画面。

同时修复cpu占用过高问题。
This commit is contained in:
sbkyy 2024-10-26 09:20:24 +08:00 committed by GitHub
parent 4c90a1a95b
commit 5c80c75ed9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/VideoStack.cpp
View File

@ -23,7 +23,11 @@
INSTANCE_IMP(VideoStackManager)
Param::~Param() { VideoStackManager::Instance().unrefChannel(id, width, height, pixfmt); }
Param::~Param() {
auto strongChn= weak_chn.lock();
if (!strongChn) { return; }
VideoStackManager::Instance().unrefChannel(id, width, height, pixfmt);
}
Channel::Channel(const std::string& id, int width, int height, AVPixelFormat pixfmt)
: _id(id), _width(width), _height(height), _pixfmt(pixfmt) {
@ -278,7 +282,9 @@ void VideoStack::start() {
_dev->inputYUV((char**)_buffer->get()->data, _buffer->get()->linesize, pts);
pts += frameInterval;
}
} else {
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
}
});
}