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

Fix concurrency issues in video bitrate stats access #1305

Merged
merged 3 commits into from
Sep 26, 2018
Merged

Fix concurrency issues in video bitrate stats access #1305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3096905
Remove concurrency issues in video bitrate stats
jcague Sep 25, 2018
f1c5b69
Initialize video_bitrate
jcague Sep 25, 2018
8635451
Merge branch 'master' into fix/concurrency_in_bitrate_sent
jcague Sep 26, 2018
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
13 changes: 2 additions & 11 deletions erizo/src/erizo/MediaStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ MediaStream::MediaStream(std::shared_ptr<Worker> worker,
pipeline_initialized_{false},
is_publisher_{is_publisher},
simulcast_{false},
bitrate_from_max_quality_layer_{0} {
bitrate_from_max_quality_layer_{0},
video_bitrate_{0} {
setVideoSinkSSRC(kDefaultVideoSinkSSRC);
setAudioSinkSSRC(kDefaultAudioSinkSSRC);
ELOG_INFO("%s message: constructor, id: %s",
Expand Down Expand Up @@ -98,16 +99,6 @@ uint32_t MediaStream::getMaxVideoBW() {
return bitrate;
}

uint32_t MediaStream::getBitrateSent() {
uint32_t bitrate = 0;
std::string video_ssrc = std::to_string(is_publisher_ ? getVideoSourceSSRC() : getVideoSinkSSRC());
if (stats_->getNode().hasChild(video_ssrc) &&
stats_->getNode()[video_ssrc].hasChild("bitrateCalculated")) {
bitrate = stats_->getNode()[video_ssrc]["bitrateCalculated"].value();
}
return bitrate;
}

void MediaStream::setMaxVideoBW(uint32_t max_video_bw) {
asyncTask([max_video_bw] (std::shared_ptr<MediaStream> stream) {
if (stream->rtcp_processor_) {
Expand Down
4 changes: 3 additions & 1 deletion erizo/src/erizo/MediaStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ class MediaStream: public MediaSink, public MediaSource, public FeedbackSink,
void close() override;
virtual uint32_t getMaxVideoBW();
virtual uint32_t getBitrateFromMaxQualityLayer() { return bitrate_from_max_quality_layer_; }
virtual uint32_t getBitrateSent();
virtual uint32_t getVideoBitrate() { return video_bitrate_; }
void setVideoBitrate(uint32_t bitrate) { video_bitrate_ = bitrate; }
void setMaxVideoBW(uint32_t max_video_bw);
void syncClose();
bool setRemoteSdp(std::shared_ptr<SdpInfo> sdp);
Expand Down Expand Up @@ -211,6 +212,7 @@ class MediaStream: public MediaSink, public MediaSource, public FeedbackSink,

std::atomic_bool simulcast_;
std::atomic<uint64_t> bitrate_from_max_quality_layer_;
std::atomic<uint32_t> video_bitrate_;
protected:
std::shared_ptr<SdpInfo> remote_sdp_;
};
Expand Down
2 changes: 1 addition & 1 deletion erizo/src/erizo/bandwidth/TargetVideoBWDistributor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void TargetVideoBWDistributor::distribute(uint32_t remb, uint32_t ssrc,
stream_infos.push_back({stream,
stream->isSimulcast(),
stream->isSlideShowModeEnabled(),
stream->getBitrateSent(),
stream->getVideoBitrate(),
stream->getMaxVideoBW(),
stream->getBitrateFromMaxQualityLayer()});
});
Expand Down
7 changes: 5 additions & 2 deletions erizo/src/erizo/rtp/StatsHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,11 @@ void StatsCalculator::processRtpPacket(std::shared_ptr<DataPacket> packet) {
}
getStatsInfo()[ssrc]["bitrateCalculated"] += len;
getStatsInfo()["total"]["bitrateCalculated"] += len;
if (packet->type == VIDEO_PACKET && packet->is_keyframe) {
incrStat(ssrc, "keyFrames");
if (packet->type == VIDEO_PACKET) {
stream_->setVideoBitrate(getStatsInfo()[ssrc]["bitrateCalculated"].value());
if (packet->is_keyframe) {
incrStat(ssrc, "keyFrames");
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion erizo/src/test/bandwidth/TargetVideoBWDistributor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class BasicTargetVideoBWDistributor {
media_stream->setAudioSourceSSRC(audio_source_ssrc);

EXPECT_CALL(*media_stream, getMaxVideoBW()).Times(AtLeast(0)).WillRepeatedly(Return(config.max_video_bw));
EXPECT_CALL(*media_stream, getBitrateSent()).Times(AtLeast(0)).WillRepeatedly(Return(config.bitrate_sent));
EXPECT_CALL(*media_stream, getVideoBitrate()).Times(AtLeast(0)).WillRepeatedly(Return(config.bitrate_sent));
EXPECT_CALL(*media_stream, getBitrateFromMaxQualityLayer()).Times(AtLeast(0))
.WillRepeatedly(Return(config.max_quality_bitrate));
EXPECT_CALL(*media_stream, isSlideShowModeEnabled()).Times(AtLeast(0)).WillRepeatedly(Return(config.slideshow));
Expand Down
2 changes: 1 addition & 1 deletion erizo/src/test/utils/Mocks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class MockMediaStream: public MediaStream {
}

MOCK_METHOD0(getMaxVideoBW, uint32_t());
MOCK_METHOD0(getBitrateSent, uint32_t());
MOCK_METHOD0(getVideoBitrate, uint32_t());
MOCK_METHOD0(getBitrateFromMaxQualityLayer, uint32_t());
MOCK_METHOD0(isSlideShowModeEnabled, bool());
MOCK_METHOD0(isSimulcast, bool());
Expand Down