ActiveSpeakerObserver: fix memory leak and more improvements #942
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- When deleted, `ActiveSpeakerObserver` must iterate all entries in its `mapProducerSpeakers` and free them. This is because `ActiveSpeakerObserver::RemoveProducer()` **won't** be called for each existing `Producer` if the `ActiveSpeakerObserver` or its parent `Router` are directly closed. - If `AddProducer()` is called with an already paused `Producer`, consider it (because this can happen). - Code cleanup such as moving class `static` members to the top, initialize numeric members and so on. - Use `producerSpeaker` to name values in `this->mapProducerSpeakers` instead of naming them `rtpObserver`.
jmillan
approved these changes
Nov 4, 2022
| @@ -308,10 +325,11 @@ namespace RTC | |||
| dominantSpeaker->EvalActivityScores(); | |||
| double newDominantC2 = C2; | |||
|
|
|||
| for (const auto& it : this->mapProducerSpeaker) | |||
| for (auto& kv : this->mapProducerSpeakers) | |||
There was a problem hiding this comment.
This is for consistency with the rest of the code. If we change this we should change it everywhere in tons of files.
| @@ -351,10 +371,11 @@ namespace RTC | |||
| { | |||
| MS_TRACE(); | |||
|
|
|||
| for (const auto& it : this->mapProducerSpeaker) | |||
| for (auto& kv : this->mapProducerSpeakers) | |||
Co-authored-by: José Luis Millán <jmillan@aliax.net>
|
In fact I'll do more changes.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🚨 When deleted,
ActiveSpeakerObservermust iterate all entries in itsmapProducerSpeakersand free them. This is becauseActiveSpeakerObserver::RemoveProducer()won't be called for each existingProducerif theActiveSpeakerObserveror its parentRouterare directly closed. So fix a memory leak here.Make
mapProducerSpeakerscontain pointers toProducerSpeakeras done everywhere else.If
AddProducer()is called with an already pausedProducer, consider it (because this can happen).Code cleanup such as moving class
staticmembers to the top, initialize numeric members, makeProducerSpeakerbe a class instead of a struct, useproducerSpeakerto name values inthis->mapProducerSpeakersinstead of naming themrtpObserver, etc.