multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/src/UT_CMccRtpInterface.cpp
--- a/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/src/UT_CMccRtpInterface.cpp Wed Sep 15 12:38:06 2010 +0300
+++ b/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/src/UT_CMccRtpInterface.cpp Wed Oct 13 14:59:15 2010 +0300
@@ -29,7 +29,6 @@
#include "mccrtpinterface.h"
#include "mccrtpdatasink.h"
#include "mccrtpkeepalivecontainer.h"
-#include "mccrtpmediaclock.h"
// CONSTRUCTION
UT_CMccRtpInterface* UT_CMccRtpInterface::NewL()
@@ -94,8 +93,6 @@
CMccRtpKeepaliveContainer::NewL( *eventHandler,
*iRtpApi,
iRtpSessionId );
-
- iRtpMediaClock = CMccRtpMediaClock::NewL();
}
void UT_CMccRtpInterface::Teardown( )
@@ -108,19 +105,13 @@
delete iRtpApi;
iRtpApi = NULL;
-
- if ( iRtpMediaClock )
- {
- delete iRtpMediaClock;
- iRtpMediaClock = NULL;
- }
}
void UT_CMccRtpInterface::UT_CMccRtpInterface_ConfigureLL()
{
TMccCodecInfo cInfo;
EUNIT_ASSERT_SPECIFIC_LEAVE(
- iInterface->ConfigureL( TMccCodecInfoBuffer( cInfo ), iRtpMediaClock ), KErrNotReady );
+ iInterface->ConfigureL( TMccCodecInfoBuffer( cInfo ) ), KErrNotReady );
TMccRtpSessionParams params;
params.iRtpAPI = iRtpApi;
@@ -130,23 +121,23 @@
iInterface->SetSessionParamsL( params );
TBuf8<1> kaData;
EUNIT_ASSERT_SPECIFIC_LEAVE(
- iInterface->ConfigureL( kaData, iRtpMediaClock ), KErrArgument );
+ iInterface->ConfigureL( kaData ), KErrArgument );
cInfo.iKeepalivePT = 13;
cInfo.iKeepaliveInterval = 0;
cInfo.iKeepaliveData = kaData;
- iInterface->ConfigureL( TMccCodecInfoBuffer( cInfo ), iRtpMediaClock );
+ iInterface->ConfigureL( TMccCodecInfoBuffer( cInfo ) );
EUNIT_ASSERT( TMccCodecInfo::Compare( cInfo, iInterface->iCodecInfo ) );
TMccCodecInfo backup = iInterface->iCodecInfo;
cInfo.iKeepaliveInterval = 28;
- iInterface->ConfigureL( TMccCodecInfoBuffer( cInfo ), iRtpMediaClock );
+ iInterface->ConfigureL( TMccCodecInfoBuffer( cInfo ) );
EUNIT_ASSERT(
cInfo.iKeepaliveInterval == iInterface->iCodecInfo.iKeepaliveInterval );
backup = iInterface->iCodecInfo;
cInfo.iKeepaliveInterval = 0;
- iInterface->ConfigureL( TMccCodecInfoBuffer( cInfo ), iRtpMediaClock );
+ iInterface->ConfigureL( TMccCodecInfoBuffer( cInfo ) );
EUNIT_ASSERT( TMccCodecInfo::Compare( backup, iInterface->iCodecInfo ) );
}