Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-07-28 21:14:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化getSnap截图接口性能

Browse Source
This commit is contained in:
xiongziliang
2026-07-08 10:51:02 +08:00
parent 92681fe6e1
commit 6d2d586fb2
3 changed files with 99 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Common/MultiMediaSourceMuxer.cpp
View File

@@ -564,7 +564,7 @@ bool MultiMediaSourceMuxer::isRecording(Recorder::type type) {
void MultiMediaSourceMuxer::startSendRtp(const MediaSourceEvent::SendRtpArgs &args, const std::function<void(uint16_t, const toolkit::SockException &)> cb) {
#if defined(ENABLE_RTPPROXY)
createGopCacheIfNeed(1);
createGopCacheIfNeed();
auto ring = _ring;
auto ssrc = args.ssrc;
@@ -636,6 +636,13 @@ bool MultiMediaSourceMuxer::stopSendRtp(const string &ssrc) {
#endif//ENABLE_RTPPROXY
}
MultiMediaSourceMuxer::RingType::RingReader::Ptr MultiMediaSourceMuxer::getFrameReader() {
auto poller = getOwnerPoller(MediaSource::NullMediaSource());
CHECK(poller->isCurrentThread());
createGopCacheIfNeed();
return _ring->attach(poller);
}
EventPoller::Ptr MultiMediaSourceMuxer::getOwnerPoller(MediaSource &sender) {
auto listener = getDelegate();
if (!listener) {
@@ -754,13 +761,7 @@ void MultiMediaSourceMuxer::onAllTrackReady() {
listener->onAllTrackReady();
}
#if defined(ENABLE_RTPPROXY)
GET_CONFIG(size_t, gop_cache, RtpProxy::kGopCache);
if (gop_cache > 0) {
createGopCacheIfNeed(gop_cache);
}
#endif
createGopCacheIfNeed();
Stamp *first = nullptr;
for (auto &pr : _stamps) {
if (!first) {
@@ -775,10 +776,11 @@ void MultiMediaSourceMuxer::onAllTrackReady() {
InfoL << "stream: " << shortUrl() << " , codec info: " << getTrackInfoStr(this);
}
void MultiMediaSourceMuxer::createGopCacheIfNeed(size_t gop_count) {
void MultiMediaSourceMuxer::createGopCacheIfNeed() {
if (_ring) {
return;
}
GET_CONFIG(size_t, gop_cache, RtpProxy::kGopCache);
weak_ptr<MultiMediaSourceMuxer> weak_self = shared_from_this();
auto src = std::make_shared<MediaSourceForMuxer>(weak_self.lock());
_ring = std::make_shared<RingType>(1024, [weak_self, src](int size) {
@@ -789,7 +791,7 @@ void MultiMediaSourceMuxer::createGopCacheIfNeed(size_t gop_count) {
strong_self->onReaderChanged(*src, strong_self->totalReaderCount());
});
}
}, gop_count);
}, std::max<size_t>(gop_cache, 1));
}
void MultiMediaSourceMuxer::resetTracks() {

5
src/Common/MultiMediaSourceMuxer.h
View File

@@ -194,6 +194,9 @@ public:
*/
std::shared_ptr<MultiMediaSourceMuxer> getMuxer(MediaSource &sender) const override;
// 获取frame ring reader
RingType::RingReader::Ptr getFrameReader();
const ProtocolOption &getOption() const;
const MediaTuple &getMediaTuple() const;
std::string shortUrl() const;
@@ -238,7 +241,7 @@ protected:
bool onTrackFrame_l(const Frame::Ptr &frame);
private:
void createGopCacheIfNeed(size_t gop_count);
void createGopCacheIfNeed();
std::shared_ptr<MediaSinkInterface> makeRecorder(Recorder::type type);
private: