From 287ae827afe48bc77d496d4be982753fa233fdd4 Mon Sep 17 00:00:00 2001 From: Dmytro Bogovych Date: Tue, 2 Apr 2019 14:39:58 +0300 Subject: [PATCH] - cleanups in types --- src/engine/audio/Audio_Interface.h | 6 +++--- src/engine/endpoint/EP_Session.cpp | 22 +++++++++++----------- src/engine/media/MT_Statistics.h | 26 +++++++++++++------------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/engine/audio/Audio_Interface.h b/src/engine/audio/Audio_Interface.h index 6bcc04ea..6feeca7c 100644 --- a/src/engine/audio/Audio_Interface.h +++ b/src/engine/audio/Audio_Interface.h @@ -35,18 +35,18 @@ namespace Audio :mRate(rate), mChannels(channels) {} - int samplesFromSize(int length) const + size_t samplesFromSize(size_t length) const { return length / 2 / mChannels; } // Returns milliseconds - float timeFromSize(int length) const + float timeFromSize(size_t length) const { return float(samplesFromSize(length) / (mRate / 1000.0)); } - float sizeFromTime(int milliseconds) const + float sizeFromTime(size_t milliseconds) const { return float((milliseconds * mRate) / 500.0 * mChannels); } diff --git a/src/engine/endpoint/EP_Session.cpp b/src/engine/endpoint/EP_Session.cpp index dd63e9dc..0f23ee65 100644 --- a/src/engine/endpoint/EP_Session.cpp +++ b/src/engine/endpoint/EP_Session.cpp @@ -466,34 +466,34 @@ void Session::getSessionInfo(Session::InfoOptions options, VariantMap& info) info[SessionInfo_PvqaReport] = s.mPvqaReport; } #endif - info[SessionInfo_NetworkMos] = (float)s.calculateMos(4.14); + info[SessionInfo_NetworkMos] = static_cast(s.calculateMos(4.14)); info[SessionInfo_AudioCodec] = s.mCodecName; stat += s; } } - info[SessionInfo_ReceivedTraffic] = (int)stat.mReceived; - info[SessionInfo_SentTraffic] = (int)stat.mSent; - info[SessionInfo_ReceivedRtp] = stat.mReceivedRtp; - info[SessionInfo_ReceivedRtcp] = stat.mReceivedRtcp; - info[SessionInfo_LostRtp] = stat.mPacketLoss; - info[SessionInfo_SentRtp] = stat.mSentRtp; - info[SessionInfo_SentRtcp] = stat.mSentRtcp; + info[SessionInfo_ReceivedTraffic] = static_cast(stat.mReceived); + info[SessionInfo_SentTraffic] = static_cast(stat.mSent); + info[SessionInfo_ReceivedRtp] = static_cast(stat.mReceivedRtp); + info[SessionInfo_ReceivedRtcp] = static_cast(stat.mReceivedRtcp); + info[SessionInfo_LostRtp] = static_cast(stat.mPacketLoss); + info[SessionInfo_SentRtp] = static_cast(stat.mSentRtp); + info[SessionInfo_SentRtcp] = static_cast(stat.mSentRtcp); if (stat.mFirstRtpTime) - info[SessionInfo_Duration] = (int)std::chrono::duration_cast(std::chrono::system_clock::now() - *(stat.mFirstRtpTime)).count(); + info[SessionInfo_Duration] = static_cast(std::chrono::duration_cast(std::chrono::system_clock::now() - *(stat.mFirstRtpTime)).count()); else info[SessionInfo_Duration] = 0; if (stat.mReceivedRtp) - info[SessionInfo_PacketLoss] = (stat.mPacketLoss * 1000) / stat.mReceivedRtp; + info[SessionInfo_PacketLoss] = static_cast((stat.mPacketLoss * 1000) / stat.mReceivedRtp); if (media) info[SessionInfo_AudioPeer] = mIceStack->remoteAddress(media->iceInfo().mStreamId, media->iceInfo().mComponentId.mRtp).toStdString(); info[SessionInfo_Jitter] = stat.mJitter; if (stat.mRttDelay.isInitialized()) - info[SessionInfo_Rtt] = (float)stat.mRttDelay.getCurrent() * 1000; + info[SessionInfo_Rtt] = static_cast(stat.mRttDelay.getCurrent() * 1000); #if defined(USE_AMR_CODEC) info[SessionInfo_BitrateSwitchCounter] = stat.mBitrateSwitchCounter; #endif diff --git a/src/engine/media/MT_Statistics.h b/src/engine/media/MT_Statistics.h index 9c82ec15..ff34f326 100644 --- a/src/engine/media/MT_Statistics.h +++ b/src/engine/media/MT_Statistics.h @@ -102,19 +102,19 @@ protected: class Statistics { public: - int mReceived, // Received traffic in bytes - mSent, // Sent traffic in bytes - mReceivedRtp, // Number of received rtp packets - mSentRtp, // Number of sent rtp packets - mReceivedRtcp, // Number of received rtcp packets - mSentRtcp, // Number of sent rtcp packets - mDuplicatedRtp, // Number of received duplicated rtp packets - mOldRtp, // Number of late rtp packets - mPacketLoss, // Number of lost packets - mIllegalRtp; // Number of rtp packets with bad payload type - int mLoss[128]; // Every item is number of loss of corresping length - int mAudioTime; // Decoded/found time in milliseconds - uint16_t mSsrc; // Last known SSRC ID in a RTP stream + size_t mReceived, // Received traffic in bytes + mSent, // Sent traffic in bytes + mReceivedRtp, // Number of received rtp packets + mSentRtp, // Number of sent rtp packets + mReceivedRtcp, // Number of received rtcp packets + mSentRtcp, // Number of sent rtcp packets + mDuplicatedRtp, // Number of received duplicated rtp packets + mOldRtp, // Number of late rtp packets + mPacketLoss, // Number of lost packets + mIllegalRtp; // Number of rtp packets with bad payload type + int mLoss[128]; // Every item is number of loss of corresping length + size_t mAudioTime; // Decoded/found time in milliseconds + uint16_t mSsrc; // Last known SSRC ID in a RTP stream ice::NetworkAddress mRemotePeer; // Last known remote RTP address // AMR codec bitrate switch counter