diff --git a/src/channel.cpp b/src/channel.cpp index bb7c1b91..6026eaca 100755 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -1153,3 +1153,23 @@ CVector CChannel::PrepSendPacket ( const CVector& vecsNPac return vecbySendBuf; } + +int CChannel::GetUploadRateKbps() +{ + int iAudioSizeOut; + + if ( bIsServer ) + { + iAudioSizeOut = iCurNetwOutBlSiFact * MIN_SERVER_BLOCK_SIZE_SAMPLES; + } + else + { + iAudioSizeOut = iCurAudioBlockSizeOut; + } + + // we assume that the UDP packet which is transported via IP has an + // additional header size of + // 8 (UDP) + 20 (IP without optional fields) = 28 bytes + return ( iAudComprSizeOut + 28 /* header */ ) * 8 /* bits per byte */ * + SYSTEM_SAMPLE_RATE / iAudioSizeOut / 1000; +} diff --git a/src/channel.h b/src/channel.h index e8627a8a..dc34c1b8 100755 --- a/src/channel.h +++ b/src/channel.h @@ -114,6 +114,7 @@ public: int GetNetwBufSizeOut() { return iCurAudioBlockSizeOut; } int GetAudioBlockSizeIn() { return iCurAudioBlockSizeIn; } + int GetUploadRateKbps(); void SetNetwBufSizeFactOut ( const int iNewNetwBlSiFactOut ); int GetNetwBufSizeFactOut() { return iCurNetwOutBlSiFact; } diff --git a/src/client.h b/src/client.h index 92008e84..608499cd 100755 --- a/src/client.h +++ b/src/client.h @@ -116,6 +116,7 @@ public: int GetNetwBufSizeOut() { return Channel.GetNetwBufSizeOut(); } int GetAudioBlockSizeIn() { return Channel.GetAudioBlockSizeIn(); } + int GetUploadRateKbps() { return Channel.GetUploadRateKbps(); } void SetAudioCompressionOut ( const EAudComprType eNewAudComprTypeOut ) { diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index 94eaf9c9..342c484f 100755 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -321,6 +321,11 @@ void CClientSettingsDlg::UpdateDisplay() // update slider controls (settings might have been changed) UpdateJitterBufferFrame(); + +// TEST +TextUpstreamValue->setText ( QString().setNum ( pClient->GetUploadRateKbps() ) + " kbps" ); + + if ( !pClient->IsRunning() ) { // clear text labels with client parameters diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui index 131269b1..eb649eac 100755 --- a/src/clientsettingsdlgbase.ui +++ b/src/clientsettingsdlgbase.ui @@ -463,7 +463,7 @@ - Upstream + Upstream Rate