diff -r 4c9e1ec7a69e -r f2ed1fc4c163 multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/src/UT_CMccRtpDataSink.cpp --- a/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/src/UT_CMccRtpDataSink.cpp Thu Jun 24 14:41:11 2010 +0300 +++ b/multimediacommscontroller/mmccrtpsourcesink/tsrc/ut_rtpsourcesink/src/UT_CMccRtpDataSink.cpp Fri Jul 09 13:14:28 2010 +0300 @@ -42,6 +42,7 @@ #include #include #include "mccunittestmacros.h" +#include "mccrtpmediaclock.h" #define MCCEVENTDATAPCKG_TO_RTCPEVENTDATAPCKG( event )\ @@ -115,6 +116,7 @@ *iRtpApi, rtpSessionId ); + iRtpMediaClock = CMccRtpMediaClock::NewL(); } void UT_CMccRtpDataSink::Teardown() @@ -136,6 +138,12 @@ delete iRtpApi; iRtpApi = NULL; } + + if ( iRtpMediaClock ) + { + delete iRtpMediaClock; + iRtpMediaClock = NULL; + } } // HELPERS @@ -156,7 +164,7 @@ TMccCodecInfo cInfo; TMccCodecInfoBuffer cInfoBuf( cInfo ); - MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) ); + MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) ); } @@ -218,7 +226,7 @@ TMccCodecInfo cInfo; TMccCodecInfoBuffer cInfoBuf( cInfo ); - MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) ); + MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) ); MCC_EUNIT_ASSERT_EQUALS( iSink->SinkThreadLogon( *this ), KErrNone ); iSink->SetCurrentUser( this ); EUNIT_ASSERT_NO_LEAVE( iSink->SinkPrimeL() ); @@ -289,7 +297,7 @@ MCC_EUNIT_ASSERT_EQUALS( iSink->SinkThreadLogon( *this ), KErrNone ); iSink->SetCurrentUser( this ); EUNIT_ASSERT_NO_LEAVE( iSink->SetSessionParamsL( params ) ); - MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) ); + MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) ); EUNIT_ASSERT_NO_LEAVE( iSink->SinkPrimeL() ); iSink->SinkThreadLogoff(); } @@ -366,7 +374,7 @@ TMccCodecInfo cInfo; TMccCodecInfoBuffer cInfoBuf( cInfo ); - MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) ); + MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) ); EUNIT_ASSERT_NO_LEAVE( iSink->SinkPrimeL() ); EUNIT_ASSERT( iRtpKeepaliveMechanism->iStopped == EFalse ); @@ -615,7 +623,7 @@ TMccCodecInfo cInfo; TMccCodecInfoBuffer cInfoBuf( cInfo ); - MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) ); + MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) ); EUNIT_ASSERT_NO_LEAVE( iSink->SinkPrimeL() ); // Create a comfort noise stream @@ -638,12 +646,12 @@ TMccCodecInfo cInfo; TMccCodecInfoBuffer cInfoBuf( cInfo ); - MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) ); + MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) ); // This should leave because the string is too short TBuf8<5> dummy; dummy.Format( _L8( "foo42" ) ); - EUNIT_ASSERT_LEAVE( iSink->ConfigureL( dummy ) ); + EUNIT_ASSERT_LEAVE( iSink->ConfigureL( dummy, iRtpMediaClock ) ); // Get a new sink //Teardown(); @@ -690,7 +698,7 @@ cInfo2.iAlgoUsed = EGenRedUsed; TMccCodecInfoBuffer cInfoBuf2( cInfo2 ); - EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf2 ) ); + EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf2, iRtpMediaClock ) ); } void UT_CMccRtpDataSink::UT_CMccRtpDataSink_RemoveStreamLL() @@ -741,7 +749,7 @@ TMccCodecInfo cInfo; TMccCodecInfoBuffer cInfoBuf( cInfo ); - MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) ); + MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) ); // Wrong state EUNIT_ASSERT_LEAVE( iSink->SinkPlayL() ); @@ -770,7 +778,7 @@ TMccCodecInfo cInfo; TMccCodecInfoBuffer cInfoBuf( cInfo ); - MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) ); + MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) ); // Wrong state EUNIT_ASSERT_LEAVE( iSink->SinkPauseL() ); @@ -797,7 +805,7 @@ TMccCodecInfo cInfo; TMccCodecInfoBuffer cInfoBuf( cInfo ); - MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf ) ); + MCC_EUNIT_ASSERT_NO_LEAVE( iSink->ConfigureL( cInfoBuf, iRtpMediaClock ) ); iSink->SinkPrimeL(); iSink->SinkPlayL();