修复webrtc开启simulcast推流时,统计观看人数线程安全相关bug (#2640)

This commit is contained in:
夏楚 2023-07-08 21:33:07 +08:00 committed by GitHub
parent 077566d1e1
commit fad8dd74e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View File

@ -59,11 +59,14 @@ bool WebRtcPusher::close(MediaSource &sender) {
}
int WebRtcPusher::totalReaderCount(MediaSource &sender) {
auto total_count = 0;
for (auto &src : _push_src_sim) {
total_count += src.second->totalReaderCount();
auto total_count = _push_src ? _push_src->totalReaderCount() : 0;
if (_simulcast) {
std::lock_guard<std::mutex> lock(_mtx);
for (auto &src : _push_src_sim) {
total_count += src.second->totalReaderCount();
}
}
return total_count + _push_src->totalReaderCount();
return total_count;
}
MediaOriginType WebRtcPusher::getOriginType(MediaSource &sender) const {
@ -96,6 +99,7 @@ void WebRtcPusher::onRecvRtp(MediaTrack &track, const string &rid, RtpPacket::Pt
}
} else {
//视频
std::lock_guard<std::mutex> lock(_mtx);
auto &src = _push_src_sim[rid];
if (!src) {
const auto& stream = _push_src->getMediaTuple().stream;

View File

@ -65,6 +65,7 @@ private:
//推流所有权
std::shared_ptr<void> _push_src_ownership;
//推流的rtsp源,支持simulcast
std::mutex _mtx;
std::unordered_map<std::string/*rid*/, RtspMediaSource::Ptr> _push_src_sim;
std::unordered_map<std::string/*rid*/, std::shared_ptr<void> > _push_src_sim_ownership;
};