diff -r f72c4fccd381 -r b0e4b01681c5 multimediacommscontroller/mmccsubcontroller/src/mccrtpkeepalive.cpp --- a/multimediacommscontroller/mmccsubcontroller/src/mccrtpkeepalive.cpp Wed Sep 15 12:38:06 2010 +0300 +++ b/multimediacommscontroller/mmccsubcontroller/src/mccrtpkeepalive.cpp Wed Oct 13 14:59:15 2010 +0300 @@ -62,7 +62,7 @@ CRtpAPI& aRtpAPI, TRtpId aRtpSessionId, TUint8 aKeepalivePayloadType, - TUint32 aKeepaliveInterval, + TUint8 aKeepaliveInterval, const TDesC8& aKeepaliveData, TBool aRemoteAddressSet ) { @@ -220,7 +220,7 @@ // --------------------------------------------------------------------------- // void CMccRtpKeepalive::UpdateParamsL( TUint8 aKeepalivePT, - TUint32 aKeepaliveInterval, const TDesC8& aKeepaliveData, CMccRtpMediaClock* aRtpMediaClock ) + TUint8 aKeepaliveInterval, const TDesC8& aKeepaliveData ) { __SUBCONTROLLER_INT1( "CMccRtpKeepalive::UpdateParamsL(), PT:", aKeepalivePT ) @@ -236,8 +236,8 @@ delete iKeepaliveData; iKeepaliveData = tmp; - iKeepaliveInterval = aKeepaliveInterval; - iRtpMediaClock = aRtpMediaClock; + const TUint KMccSecsToMicroSecs = 1000000; + iKeepaliveInterval = aKeepaliveInterval * KMccSecsToMicroSecs; } // --------------------------------------------------------------------------- @@ -412,7 +412,7 @@ if ( !IsActive() && ( 0 < iKeepaliveInterval ) ) { - if ( iRemoteAddressSet && iRtpMediaClock ) + if ( iRemoteAddressSet ) { __SUBCONTROLLER( "CMccRtpKeepalive::StartSending(), issue send timer" ) @@ -548,7 +548,7 @@ // void CMccRtpKeepalive::ConstructL( TUint8 aKeepalivePayloadType, - TUint32 aKeepaliveInterval, + TUint8 aKeepaliveInterval, const TDesC8& aKeepaliveData ) { __SUBCONTROLLER( "CMccRtpKeepalive::ConstructL()" ) @@ -561,7 +561,7 @@ iRtpHeaderInfo.iMarker = 0; UpdateParamsL( aKeepalivePayloadType, aKeepaliveInterval, - aKeepaliveData, NULL ); + aKeepaliveData ); iSequenceNum = Random();