qiurui
/
uvgrtp-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multiplex: Improve thread safety in reception_flow pull_frame

This commit is contained in:
Heikki Tampio 2023-06-28 08:02:09 +03:00
parent 2781fb3def
commit a8fc623f5a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/reception_flow.cc
View File

@ -243,18 +243,16 @@ uvgrtp::frame::rtp_frame* uvgrtp::reception_flow::pull_frame(std::shared_ptr<std
return nullptr;
// Check if the source ssrc in the frame matches the remote ssrc that we want to pull frames from
bool found_frame = false;
uvgrtp::frame::rtp_frame* frame = nullptr;
frames_mtx_.lock();
auto frame = frames_.front();
if (frame->header.ssrc == remote_ssrc.get()->load()) {
frames_.erase(frames_.begin());
found_frame = true;
if (!frames_.empty()) {
frame = frames_.front();
if (frame->header.ssrc == remote_ssrc.get()->load()) {
frames_.erase(frames_.begin());
}
}
frames_mtx_.unlock();
if (found_frame) {
return frame;
}
return nullptr;
return frame;
}
uvgrtp::frame::rtp_frame* uvgrtp::reception_flow::pull_frame(ssize_t timeout_ms, std::shared_ptr<std::atomic<std::uint32_t>> remote_ssrc)