--- a/mmserv/voipaudioservices/VoIPServer/inc/VoIPServerThread.h Fri Sep 03 19:34:12 2010 -0500
+++ b/mmserv/voipaudioservices/VoIPServer/inc/VoIPServerThread.h Tue Sep 21 11:38:43 2010 -0500
@@ -45,8 +45,8 @@
// Base abstract class for creating VoIP uplink and downlink threads.
// -----------------------------------------------------------------------------
class CVoIPThreadBase : public CBase,
- public MDevSoundObserver,
- public MQueueHandlerObserverSrv
+ public MDevSoundObserver,
+ public MQueueHandlerObserverSrv
{
public:
enum TStreamState
@@ -73,8 +73,9 @@
void InitMsgQueuesL(const TDesC& aBufferQ, const TDesC& aComQ);
TInt DoChunk(const TDesC& aChunkName, const TInt aChunkLen,
const TInt aChunkMaxLen);
- TInt DetermineMaxBufferLen(TVoIPCodecSettings::TG711FrameRate
- aG711FrameRate = TVoIPCodecSettings::E20MS);
+ TInt DetermineMaxBufferLen(
+ TVoIPCodecSettings::TG711FrameRate aG711FrameRate =
+ TVoIPCodecSettings::E20MS);
// From MDevSoundObserver
virtual void InitializeComplete(TInt aError) = 0;
@@ -105,7 +106,6 @@
CVoIPFormatIntfc::TG711CodecMode iG711CodecMode;
CVoIPFormatIntfc::TILBCCodecMode iILBCCodecMode;
-
};
// -----------------------------------------------------------------------------
@@ -114,7 +114,7 @@
// Class handling VoIP downlink in a separate thread.
// -----------------------------------------------------------------------------
class CVoIPDownlinkThread : public CVoIPThreadBase,
- public MJitterBufferObserver
+ public MJitterBufferObserver
{
public:
static TInt ThreadFunction(TAny* aData);
@@ -154,7 +154,7 @@
// For Jitter Buffer
/**
* ?description
- * @since S60 v5.0
+ *
* @param none
* @return void
*/
@@ -162,7 +162,7 @@
/**
* ?description
- * @since S60 v5.0
+ *
* @param none
* @return void
*/
@@ -170,7 +170,7 @@
/**
* ?description
- * @since S60 v5.0
+ *
* @param none
* @return void
*/
@@ -178,7 +178,7 @@
/**
* ?description
- * @since S60 v5.0
+ *
* @param none
* @return void
*/
@@ -215,7 +215,6 @@
#ifdef _DEBUG
TInt iSamplesPlayedCount;
#endif
-
};
// -----------------------------------------------------------------------------
@@ -269,6 +268,7 @@
TSharedData& iShared;
TBool iVad;
+ RArray<TUint> iBitrates;
CSpeechEncoderConfig* iSpeechEncoderConfig;
CG711EncoderIntfc* iG711EncoderIntfc;
@@ -278,7 +278,6 @@
#ifdef _DEBUG
TInt iSamplesRecCount;
#endif
-
};
#endif // VOIPAUDIOSERVERTHREAD_H