diff -r f72c4fccd381 -r b0e4b01681c5 multimediacommscontroller/mmccrtpsourcesink/inc/mccjittercalculator.h --- a/multimediacommscontroller/mmccrtpsourcesink/inc/mccjittercalculator.h Wed Sep 15 12:38:06 2010 +0300 +++ b/multimediacommscontroller/mmccrtpsourcesink/inc/mccjittercalculator.h Wed Oct 13 14:59:15 2010 +0300 @@ -44,7 +44,7 @@ class MRtpJitterObserver { public: - virtual void SendJitterEvent( TMccRtpEventDataExtended aEvent, TInt aError ) = 0; + virtual void SendJitterEvent( TMccRtpEventData aEvent, TInt aError ) = 0; }; @@ -91,7 +91,7 @@ * RTP header from received packet * @return void */ - void RtpPacketReceived( const TUint32 aTimeStamp, TBool aMarker, TUint16 aSeqNum ); + void RtpPacketReceived( const TUint32 aTimeStamp, TBool aMarker ); /** * Set media configurations @@ -134,44 +134,6 @@ */ void JitterObserving(); - /** - * Counts packet loss percentage from iStartingSeqNum, iCurrentSeqNum - * and iReceivedPacketCounter - * @return Counted packet loss percentage - */ - TInt CountPacketLossPercentage(); - - /** - * Checks if current jitter level exceeds the jitter level given by the client, - * and if exceeded, sends the report to client - * @param "aReportIntervalReached" - * Changed to ETrue if the report interval was reached - * @param "aReportSent" - * Changed to ETrue if the jitter report was sent - * @return void - */ - void CheckJitter( TBool& aReportIntervalReached, TBool& aReportSent ); - - /** - * Checks if current packet loss level exceeds the packet loss level - * given by the client, and if exceeded, sends the report to client - * @param "aReportIntervalReached" - * Changed to ETrue if the report interval was reached - * @param "aReportSent" - * Changed to ETrue if the packet loss report was sent - * @return void - */ - void CheckPacketLoss( TBool& aReportIntervalReached, TBool& aReportSent ); - - /** - * Calculates a new FER value - * @param aPrevValue Previous FER value - * @param aAdd Value to add( ETrue/EFalse) - * @param aFlag To add (ETrue) or remove (EFalse) - * @return new FER value - */ - TUint32 CalculateFer( TUint32 aPrevValue, TBool aAdd, TBool aFlag ); - private: // Number of packets received @@ -229,21 +191,6 @@ */ MRtpJitterObserver* iObserver; - // Current packet sequence number - TUint16 iCurrentSeqNum; - - // Packet sequence number where to start counting the packet loss - TUint16 iStartingSeqNum; - - // Holds the previous number of packets expected - TUint32 iPrevExpectedPackets; - - // Holds the previous number of packets received - TUint32 iPrevPacketsReceived; - - // Holds the previous FER value - TUint32 iPrevFerValue; - #ifdef FTD_ENABLED // Message queue carrying stream statistics