Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add synchronization to RtcpNackResponder::Storage #956

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Add synchronization to RtcpNackResponder::Storage #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/rtc/rtcpnackresponder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ class RTC_CPP_EXPORT RtcpNackResponder final : public MediaHandlerElement {
shared_ptr<Element> oldest = nullptr;
/// Newest packet in storage
shared_ptr<Element> newest = nullptr;

/// Inner storage
std::unordered_map<uint16_t, shared_ptr<Element>> storage{};
std::mutex mutex;

/// Maximum storage size
const unsigned maximumSize;
Expand Down
2 changes: 2 additions & 0 deletions src/rtcpnackresponder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RtcpNackResponder::Storage::Storage(unsigned _maximumSize) : maximumSize(_maximu
}

optional<binary_ptr> RtcpNackResponder::Storage::get(uint16_t sequenceNumber) {
std::lock_guard lock(mutex);
auto position = storage.find(sequenceNumber);
return position != storage.end() ? std::make_optional(storage.at(sequenceNumber)->packet)
: nullopt;
Expand All @@ -40,6 +41,7 @@ void RtcpNackResponder::Storage::store(binary_ptr packet) {
auto rtp = reinterpret_cast<RtpHeader *>(packet->data());
auto sequenceNumber = rtp->seqNumber();

std::lock_guard lock(mutex);
assert((storage.empty() && !oldest && !newest) || (!storage.empty() && oldest && newest));

if (size() == 0) {
Expand Down