From 7b485429d84e4253ac937f23652cabf9edb113f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 9 Jun 2022 16:46:09 -0400
Subject: [PATCH] rtp: cleanup storing bitrate info
Change-Id: Ibfc4d65be3969832ba1ea84106d55c29d22e9dcd
---
src/media/video/video_rtp_session.cpp | 35 +++++++--------------------
1 file changed, 9 insertions(+), 26 deletions(-)
diff --git a/src/media/video/video_rtp_session.cpp b/src/media/video/video_rtp_session.cpp
index 193d2006d1..ffb719427b 100644
--- a/src/media/video/video_rtp_session.cpp
+++ b/src/media/video/video_rtp_session.cpp
@@ -705,21 +705,14 @@ VideoRtpSession::setupVideoBitrateInfo()
{
auto codecVideo = std::static_pointer_cast<jami::AccountVideoCodecInfo>(send_.codec);
if (codecVideo) {
+ auto& info = codecVideo->systemCodecInfo;
videoBitrateInfo_ = {
- (unsigned) (jami::stoi(
- codecVideo
- ->getCodecSpecifications()[DRing::Account::ConfProperties::CodecInfo::BITRATE])),
- (unsigned) (jami::stoi(codecVideo->getCodecSpecifications()
- [DRing::Account::ConfProperties::CodecInfo::MIN_BITRATE])),
- (unsigned) (jami::stoi(codecVideo->getCodecSpecifications()
- [DRing::Account::ConfProperties::CodecInfo::MAX_BITRATE])),
- (unsigned) (jami::stoi(
- codecVideo
- ->getCodecSpecifications()[DRing::Account::ConfProperties::CodecInfo::QUALITY])),
- (unsigned) (jami::stoi(codecVideo->getCodecSpecifications()
- [DRing::Account::ConfProperties::CodecInfo::MIN_QUALITY])),
- (unsigned) (jami::stoi(codecVideo->getCodecSpecifications()
- [DRing::Account::ConfProperties::CodecInfo::MAX_QUALITY])),
+ codecVideo->bitrate,
+ info.minBitrate,
+ info.maxBitrate,
+ codecVideo->quality,
+ info.minQuality,
+ info.maxQuality,
videoBitrateInfo_.cptBitrateChecking,
videoBitrateInfo_.maxBitrateChecking,
videoBitrateInfo_.packetLostThreshold,
@@ -734,18 +727,8 @@ void
VideoRtpSession::storeVideoBitrateInfo()
{
if (auto codecVideo = std::static_pointer_cast<jami::AccountVideoCodecInfo>(send_.codec)) {
- codecVideo->setCodecSpecifications({{DRing::Account::ConfProperties::CodecInfo::BITRATE,
- std::to_string(videoBitrateInfo_.videoBitrateCurrent)},
- {DRing::Account::ConfProperties::CodecInfo::MIN_BITRATE,
- std::to_string(videoBitrateInfo_.videoBitrateMin)},
- {DRing::Account::ConfProperties::CodecInfo::MAX_BITRATE,
- std::to_string(videoBitrateInfo_.videoBitrateMax)},
- {DRing::Account::ConfProperties::CodecInfo::QUALITY,
- std::to_string(videoBitrateInfo_.videoQualityCurrent)},
- {DRing::Account::ConfProperties::CodecInfo::MIN_QUALITY,
- std::to_string(videoBitrateInfo_.videoQualityMin)},
- {DRing::Account::ConfProperties::CodecInfo::MAX_QUALITY,
- std::to_string(videoBitrateInfo_.videoQualityMax)}});
+ codecVideo->bitrate = videoBitrateInfo_.videoBitrateCurrent;
+ codecVideo->quality = videoBitrateInfo_.videoQualityCurrent;
}
}
--
GitLab