From a538de38da18995263a2b2130dd77b12c2a7f082 Mon Sep 17 00:00:00 2001
From: philippegorley <philippe.gorley@savoirfairelinux.com>
Date: Fri, 16 Aug 2019 15:25:17 -0400
Subject: [PATCH] video_rtp_session: prevent nullptr dereference
Also removes log message.
Change-Id: I5fc4dff440641f604f7f522d8319523715f4ef89
---
src/media/video/video_rtp_session.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/media/video/video_rtp_session.cpp b/src/media/video/video_rtp_session.cpp
index ae29252b15..f12bb12f80 100644
--- a/src/media/video/video_rtp_session.cpp
+++ b/src/media/video/video_rtp_session.cpp
@@ -419,10 +419,9 @@ VideoRtpSession::adaptQualityAndBitrate()
//Take action only when two successive drop superior to 5% are catched...
//and when jitter is less than 1 seconds
auto pondLoss = getPonderateLoss(rtcpi.packetLoss);
- JAMI_DBG("[AutoAdapt] Pondloss: %f%, last loss: %f%", pondLoss, rtcpi.packetLoss);
- if(pondLoss >= 5.0f)
- {
- videoBitrateInfo_.videoBitrateCurrent = videoBitrateInfo_.videoBitrateCurrent * (1.0f - rtcpi.packetLoss/200.0f);
+ //JAMI_DBG("[AutoAdapt] Pondloss: %f%%, last loss: %f%%", pondLoss, rtcpi.packetLoss);
+ if(pondLoss >= 5.0f) {
+ videoBitrateInfo_.videoBitrateCurrent = videoBitrateInfo_.videoBitrateCurrent * (1.0f - rtcpi.packetLoss/200.0f);
JAMI_DBG("[AutoAdapt] pondLoss: %f%%, packet loss rate: %f%%, decrease bitrate from %d Kbps to %d Kbps, ratio %f", pondLoss, rtcpi.packetLoss, oldBitrate, videoBitrateInfo_.videoBitrateCurrent, (float) videoBitrateInfo_.videoBitrateCurrent / oldBitrate);
histoLoss_.clear();
}
@@ -434,7 +433,7 @@ VideoRtpSession::adaptQualityAndBitrate()
storeVideoBitrateInfo();
// If encoder no longer exist do nothing
- if(sender_->setBitrate(videoBitrateInfo_.videoBitrateCurrent) == 0)
+ if(sender_ && sender_->setBitrate(videoBitrateInfo_.videoBitrateCurrent) == 0)
lastMediaRestart_ = now;
}
}
--
GitLab