added upstream rate calculation

src/channel.cpp

@@ -1153,3 +1153,23 @@ CVector<unsigned char> CChannel::PrepSendPacket ( const CVector<short>& 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;
+}

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; }

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 )
     {

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

src/clientsettingsdlgbase.ui

@@ -463,7 +463,7 @@
         <item>
          <widget class="QLabel" name="TextUpstream" >
           <property name="text" >
-           <string>Upstream</string>
+           <string>Upstream Rate</string>
           </property>
          </widget>
         </item>