diff -r 4c9e1ec7a69e -r f2ed1fc4c163 multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/Src/UT_CMccRtpKeepalive.cpp
--- a/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/Src/UT_CMccRtpKeepalive.cpp	Thu Jun 24 14:41:11 2010 +0300
+++ b/multimediacommscontroller/mmccsubcontroller/tsrc/ut_subcontroller/Src/UT_CMccRtpKeepalive.cpp	Fri Jul 09 13:14:28 2010 +0300
@@ -83,6 +83,8 @@
 
 void UT_CMccRtpKeepalive::SetupL()
     {
+    iRtpMediaClock = CMccRtpMediaClock::NewL();
+    
     iEventHandler = CMccTestEventHandler::NewL();
     iRtpApi = CRtpAPI::NewL( *iEventHandler );
     TPckgBuf<TInt> params( 30000 );
@@ -92,15 +94,15 @@
 	TMccCodecInfo codecInfo;
 	TMccCodecInfoBuffer infoBuffer( codecInfo );
 	CMccRtpDataSource* dSource = static_cast<CMccRtpDataSource*>( iRtpSource );
-	dSource->ConfigureL( infoBuffer );
+	dSource->ConfigureL( infoBuffer, iRtpMediaClock );
 	CMccRtpDataSink* dSink = static_cast<CMccRtpDataSink*>( iRtpSink );
-	dSink->ConfigureL( infoBuffer );
-	
-	iRtpMediaClock = CMccRtpMediaClock::NewL();
+	dSink->ConfigureL( infoBuffer, iRtpMediaClock );
     } 
 
 void UT_CMccRtpKeepalive::Setup2L()
     {
+    iRtpMediaClock = CMccRtpMediaClock::NewL();
+    
     iEventHandler = CMccTestEventHandler::NewL();
     iRtpApi = CRtpAPI::NewL( *iEventHandler );
     TPckgBuf<TInt> params( 30000 );
@@ -110,11 +112,10 @@
 	TMccCodecInfo codecInfo;
 	TMccCodecInfoBuffer infoBuffer( codecInfo );
 	CMccRtpDataSource* dSource = static_cast<CMccRtpDataSource*>( iRtpSource );
-	dSource->ConfigureL( infoBuffer );
+	dSource->ConfigureL( infoBuffer, iRtpMediaClock );
 	CMccRtpDataSink* dSink = static_cast<CMccRtpDataSink*>( iRtpSink );
-	dSink->ConfigureL( infoBuffer );
+	dSink->ConfigureL( infoBuffer, iRtpMediaClock );
 	
-	iRtpMediaClock = CMccRtpMediaClock::NewL();
 	iKeepaliveHandler = 
 	    CMccRtpKeepalive::NewL( *iEventHandler, *iRtpApi, TRtpId(), 96, 1000, KNullDesC8, ETrue );
 	    
@@ -177,11 +178,11 @@
         EUNIT_ASSERT_EQUALS( container->RemoteAddressSet(), KErrNone );
         
         // Update valid case
-        MCC_EUNIT_ASSERT_NO_LEAVE( container->UpdateParamsL( *static_cast<CMccRtpDataSink*>( iRtpSink ), codecInfo ) );
+        MCC_EUNIT_ASSERT_NO_LEAVE( container->UpdateParamsL( *static_cast<CMccRtpDataSink*>( iRtpSink ), codecInfo, *iRtpMediaClock ) );
         
         // Update with keealive interval 0
         codecInfo.iKeepaliveInterval = 0;
-        MCC_EUNIT_ASSERT_NO_LEAVE( container->UpdateParamsL( *static_cast<CMccRtpDataSink*>( iRtpSink ), codecInfo ) );
+        MCC_EUNIT_ASSERT_NO_LEAVE( container->UpdateParamsL( *static_cast<CMccRtpDataSink*>( iRtpSink ), codecInfo, *iRtpMediaClock ) );
         
         // Stop keepalive
         //
@@ -226,11 +227,11 @@
         EUNIT_ASSERT_EQUALS( container->RemoteAddressSet(), KErrNone );
         
         // Update valid case
-        container->UpdateParamsL( *static_cast<CMccRtpDataSink*>( iRtpSink ), codecInfo );
+        container->UpdateParamsL( *static_cast<CMccRtpDataSink*>( iRtpSink ), codecInfo, *iRtpMediaClock );
         
         // Update with keealive interval 0
         codecInfo.iKeepaliveInterval = 0;
-        container->UpdateParamsL( *static_cast<CMccRtpDataSink*>( iRtpSink ), codecInfo );
+        container->UpdateParamsL( *static_cast<CMccRtpDataSink*>( iRtpSink ), codecInfo, *iRtpMediaClock );
         
         
         // Stop keepalive
@@ -337,7 +338,7 @@
 	    CleanupStack::PushL( keepaliveHandler );    
     
         TUint8 keepalivePT(96); 
-        TUint8 keepaliveInterval(25);    
+        TUint32 keepaliveInterval(25000000);    
         const TUint8 KAmrKeepAlivePayload[6] = 
         { 
         0xF4, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -346,11 +347,11 @@
         keepAliveData.Copy( KAmrKeepAlivePayload );
         
         // Valid case
-        EUNIT_ASSERT_LEAVE( keepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData ) );
+        EUNIT_ASSERT_LEAVE( keepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData, iRtpMediaClock ) );
 
         // Wrong payload type
         keepalivePT = 129;
-        EUNIT_ASSERT_LEAVE( keepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData ) );    
+        EUNIT_ASSERT_LEAVE( keepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData, iRtpMediaClock ) );    
         CleanupStack::PopAndDestroy( keepaliveHandler );
         }
     else
@@ -359,7 +360,7 @@
      	    CMccRtpKeepalive::NewL( *iEventHandler, *iRtpApi, TRtpId(), 96, 1000, KNullDesC8, ETrue );
         
         TUint8 keepalivePT(96); 
-        TUint8 keepaliveInterval(25);    
+        TUint32 keepaliveInterval(25000000);    
         const TUint8 KAmrKeepAlivePayload[6] = 
         { 
         0xF4, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -368,11 +369,11 @@
         keepAliveData.Copy( KAmrKeepAlivePayload );
         
         // Valid case
-        MCC_EUNIT_ASSERT_NO_LEAVE( iKeepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData ) );
+        MCC_EUNIT_ASSERT_NO_LEAVE( iKeepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData, iRtpMediaClock ) );
 
         // Wrong payload type
         keepalivePT = 129;
-        MCC_EUNIT_ASSERT_SPECIFIC_LEAVE( iKeepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData ), KErrArgument );            
+        MCC_EUNIT_ASSERT_SPECIFIC_LEAVE( iKeepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData, iRtpMediaClock ), KErrArgument );            
         }
     }
 
@@ -445,8 +446,8 @@
         iKeepaliveHandler->iStatus = KErrNone;
         iKeepaliveHandler->iCurrentState = CMccRtpKeepalive::ESending;
         MCC_EUNIT_ASSERT_NO_LEAVE( iKeepaliveHandler->RunL() );
-        EUNIT_ASSERT( iKeepaliveHandler->iCurrentState == CMccRtpKeepalive::EWaitingTimer );
-        EUNIT_ASSERT( iKeepaliveHandler->IsActive() );
+        EUNIT_ASSERT( iKeepaliveHandler->iCurrentState == CMccRtpKeepalive::ESendingPending );
+        EUNIT_ASSERT( !iKeepaliveHandler->IsActive() );
         
         // Completed in not supported state
         iKeepaliveHandler->iStatus = KErrNone;
@@ -472,12 +473,14 @@
         };
         TBuf8<6> keepAliveData;
         keepAliveData.Copy( KAmrKeepAlivePayload );
-        EUNIT_ASSERT_LEAVE( iKeepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData ) );
+        EUNIT_ASSERT_LEAVE( iKeepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData, iRtpMediaClock ) );
         
         // Send completion ok when not active anymore, timer is started
         iKeepaliveHandler->Cancel();
         iKeepaliveHandler->iStatus = KErrNone;
         iKeepaliveHandler->iCurrentState = CMccRtpKeepalive::ESending;
+        iKeepaliveHandler->iRtpMediaClock = iRtpMediaClock;
+        
         MCC_EUNIT_ASSERT_NO_LEAVE( iKeepaliveHandler->RunL() );
         EUNIT_ASSERT( iKeepaliveHandler->iCurrentState == CMccRtpKeepalive::EWaitingTimer );
         EUNIT_ASSERT( iKeepaliveHandler->IsActive() );
@@ -508,10 +511,10 @@
         // Send completion ok when not active anymore, timer is started
         iKeepaliveHandler->Cancel();
         iKeepaliveHandler->iStatus = KErrNone;
-        iKeepaliveHandler->iCurrentState = CMccRtpKeepalive::ESending;
+        iKeepaliveHandler->iCurrentState = CMccRtpKeepalive::ESending;        
         iKeepaliveHandler->RunL();
-        EUNIT_ASSERT( iKeepaliveHandler->iCurrentState == CMccRtpKeepalive::EWaitingTimer );
-        EUNIT_ASSERT( iKeepaliveHandler->IsActive() );
+        EUNIT_ASSERT( iKeepaliveHandler->iCurrentState == CMccRtpKeepalive::ESendingPending );
+        EUNIT_ASSERT( !iKeepaliveHandler->IsActive() );
         
         // Completed in not supported state
         iKeepaliveHandler->iStatus = KErrNone;
@@ -537,7 +540,7 @@
         };
         TBuf8<6> keepAliveData;
         keepAliveData.Copy( KAmrKeepAlivePayload );
-        MCC_EUNIT_ASSERT_NO_LEAVE( iKeepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData ) );
+        MCC_EUNIT_ASSERT_NO_LEAVE( iKeepaliveHandler->UpdateParamsL( keepalivePT, keepaliveInterval, keepAliveData, iRtpMediaClock ) );
         
         // Send completion ok when not active anymore, timer is started
         iKeepaliveHandler->Cancel();