Skip to content
Snippets Groups Projects
Commit 7b485429 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

rtp: cleanup storing bitrate info 

Change-Id: Ibfc4d65be3969832ba1ea84106d55c29d22e9dcd
parent 4ff4a32d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/media/video/video_rtp_session.cpp
+ 9
− 26
View file @ 7b485429
...@@ -705,21 +705,14 @@ VideoRtpSession::setupVideoBitrateInfo() ...@@ -705,21 +705,14 @@ VideoRtpSession::setupVideoBitrateInfo()
{ {
auto codecVideo = std::static_pointer_cast<jami::AccountVideoCodecInfo>(send_.codec); auto codecVideo = std::static_pointer_cast<jami::AccountVideoCodecInfo>(send_.codec);
if (codecVideo) { if (codecVideo) {
auto& info = codecVideo->systemCodecInfo;
videoBitrateInfo_ = { videoBitrateInfo_ = {
(unsigned) (jami::stoi( codecVideo->bitrate,
codecVideo info.minBitrate,
->getCodecSpecifications()[DRing::Account::ConfProperties::CodecInfo::BITRATE])), info.maxBitrate,
(unsigned) (jami::stoi(codecVideo->getCodecSpecifications() codecVideo->quality,
[DRing::Account::ConfProperties::CodecInfo::MIN_BITRATE])), info.minQuality,
(unsigned) (jami::stoi(codecVideo->getCodecSpecifications() info.maxQuality,
[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])),
videoBitrateInfo_.cptBitrateChecking, videoBitrateInfo_.cptBitrateChecking,
videoBitrateInfo_.maxBitrateChecking, videoBitrateInfo_.maxBitrateChecking,
videoBitrateInfo_.packetLostThreshold, videoBitrateInfo_.packetLostThreshold,
...@@ -734,18 +727,8 @@ void ...@@ -734,18 +727,8 @@ void
VideoRtpSession::storeVideoBitrateInfo() VideoRtpSession::storeVideoBitrateInfo()
{ {
if (auto codecVideo = std::static_pointer_cast<jami::AccountVideoCodecInfo>(send_.codec)) { if (auto codecVideo = std::static_pointer_cast<jami::AccountVideoCodecInfo>(send_.codec)) {
codecVideo->setCodecSpecifications({{DRing::Account::ConfProperties::CodecInfo::BITRATE, codecVideo->bitrate = videoBitrateInfo_.videoBitrateCurrent;
std::to_string(videoBitrateInfo_.videoBitrateCurrent)}, codecVideo->quality = videoBitrateInfo_.videoQualityCurrent;
{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)}});
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment