--- a/multimediacommscontroller/mmccinterface/src/mmcccodecinformation.cpp	Wed Sep 15 12:38:06 2010 +0300
+++ b/multimediacommscontroller/mmccinterface/src/mmcccodecinformation.cpp	Wed Oct 13 14:59:15 2010 +0300
@@ -37,7 +37,6 @@
 const TUint KDefaultPreference = EMdaPriorityPreferenceNone;
 const TUint KDefaultPriority = EMdaPriorityNormal;
 const TInt KDefaultModeChangePeriod = 1;
-const TUint KMccSecsToMicroSecs = 1000000;
 
 
 // MACROS
@@ -137,16 +136,7 @@
     iFrameSize = codecInfo.iFrameSize;
     iHwFrameTime = codecInfo.iHwFrameTime;
     
-    if( (codecInfo.iKeepaliveInterval / KMccSecsToMicroSecs) > KMaxTUint8 )
-    	{
-    	iKeepAliveTimer = KMaxTUint8;
-    	iKeepAliveTimerMicroSecs = KMaxTUint8 * KMccSecsToMicroSecs;	
-    	}
-    else
-    	{
-    	iKeepAliveTimer = codecInfo.iKeepaliveInterval / KMccSecsToMicroSecs;
-    	iKeepAliveTimerMicroSecs = codecInfo.iKeepaliveInterval;	
-    	}
+    iKeepAliveTimer = codecInfo.iKeepaliveInterval;
     iKeepAlivePT = codecInfo.iKeepalivePT;
     iKeepAliveData = codecInfo.iKeepaliveData;
     
@@ -198,7 +188,7 @@
     codecInfo.iRedundantPayload = iRedundancyPT;
     codecInfo.iNeighbor = iNeighbor;
     codecInfo.iModeChangePeriod = iModeChangePeriod;
-    codecInfo.iKeepaliveInterval = iKeepAliveTimerMicroSecs;
+    codecInfo.iKeepaliveInterval = iKeepAliveTimer;
     codecInfo.iKeepalivePT = iKeepAlivePT;
     codecInfo.iKeepaliveData = iKeepAliveData;
     codecInfo.iMaxRed = iMaxRed;
@@ -934,7 +924,6 @@
 TInt CMccCodecInformation::SetKeepAliveTimer( TUint8 aTimerValue )
     {
     iKeepAliveTimer = aTimerValue;
-    iKeepAliveTimerMicroSecs = aTimerValue * KMccSecsToMicroSecs;
     return KErrNone;    
     }
 
@@ -994,34 +983,3 @@
     {
     return iKeepAliveData;
     }
-
-// -----------------------------------------------------------------------------
-// CMccCodecInformation:SetKeepAliveTimerMicroSecs
-// Default implementation
-// -----------------------------------------------------------------------------
-// 
-TInt CMccCodecInformation::SetKeepAliveTimerMicroSecs( 
-									TUint32 aTimerValueMicroSecs )
-    {
-    if( (aTimerValueMicroSecs / KMccSecsToMicroSecs) > KMaxTUint8 )
-    	{
-    	iKeepAliveTimer = KMaxTUint8;
-    	iKeepAliveTimerMicroSecs = KMaxTUint8 * KMccSecsToMicroSecs;	
-    	}
-    else
-    	{
-    	iKeepAliveTimer = aTimerValueMicroSecs / KMccSecsToMicroSecs;	
-    	iKeepAliveTimerMicroSecs = aTimerValueMicroSecs;
-    	}
-    return KErrNone;    
-    }
-
-// -----------------------------------------------------------------------------
-// CMccCodecInformation:KeepAliveTimerMicroSecs
-// Default implementation
-// -----------------------------------------------------------------------------
-// 
-TUint32 CMccCodecInformation::KeepAliveTimerMicroSecs() const
-    {
-    return iKeepAliveTimerMicroSecs;
-    }