Avoid using publisher from OTM #1556
Merged
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
lodoyun
approved these changes
Mar 18, 2020
| @@ -69,13 +70,14 @@ namespace erizo { | |||
| return 0; | |||
| } | |||
| boost::unique_lock<boost::mutex> lock(monitor_mutex_); | |||
| if (subscribers.empty()) | |||
| if (subscribers_.empty() || !publisher_) { | |||
erizo/src/erizo/OneToManyProcessor.h
Outdated
| int deliverAudioData_(std::shared_ptr<DataPacket> audio_packet) override; | ||
| int deliverVideoData_(std::shared_ptr<DataPacket> video_packet) override; | ||
| int deliverFeedback_(std::shared_ptr<DataPacket> fb_packet) override; | ||
| int deliverEvent_(MediaEventPtr event) override; | ||
| boost::future<void> closeAll(); | ||
| bool isSSRCFromAudio(uint32_t ssrc); | ||
| uint32_t translateAndMaybeAdaptForSimulcast(uint32_t orig_ssrc); | ||
|
|
||
| private: | ||
| typedef std::shared_ptr<MediaSink> sink_ptr; |
There was a problem hiding this comment.
💯 to the variable names updates. In that line, shouldn't this be sink_ptr_ ?
There was a problem hiding this comment.
actually we can remove it because we don't use it
There was a problem hiding this comment.
It was a typedef instead, but we don't use to define any variable in this class
| @@ -165,7 +165,7 @@ NAN_METHOD(OneToManyProcessor::getPublisherState) { | |||
| return; | |||
| } | |||
|
|
|||
| auto wr = std::dynamic_pointer_cast<erizo::MediaStream>(me->publisher); | |||
| auto wr = std::dynamic_pointer_cast<erizo::MediaStream>(me->getPublisher()); | |||
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.
Description
There have been other crashes inside OneToManyProcessor when trying to access publisher's stuff.
[] It needs and includes Unit Tests
Changes in Client or Server public APIs
Not needed.
[] It includes documentation for these changes in
/doc.