diff -r b5e99d8877c7 -r 0dcb073356a5 rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpAPI.h --- a/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpAPI.h Tue Aug 31 15:32:57 2010 +0300 +++ b/rtp/rtpstack/tsrc/ut_rtpstack/inc/UT_CRtpAPI.h Wed Sep 01 12:27:36 2010 +0100 @@ -65,8 +65,7 @@ public MRtpObserver, public MNonRTPDataObserver, public MRtcpObserver, - public MSRTPReKeyingObserver, - public MRtpPostProcessingObserver + public MSRTPReKeyingObserver { public: // Constructors and destructors @@ -104,8 +103,6 @@ void SRTPMasterKeyStaleEvent(const CSRTPSession& aSession); void SRTPMasterKeyStaleEvent(const CSRTPStream& aStream); - void ReadyToSendRtpPacket( TRtpId aTranStreamId, TPtr8 &aPacket ); - private: // New methods void SetupL(); @@ -122,7 +119,7 @@ void UT_CRtpAPI_StartConnectionL(); - void UT_CRtpAPI_StartConnection_OneL(); + void UT_CRtpAPI_StartConnection_1L(); void UT_CRtpAPI_CancelStartL(); @@ -183,7 +180,7 @@ void UT_CRtpAPI_SendRtpPacket_2L(); - void UT_CRtpAPI_SendRtpPacket_ThreeL(); + void UT_CRtpAPI_SendRtpPacket_3L(); void UT_CRtpAPI_SendDataLL(); @@ -243,12 +240,7 @@ void UT_CRtpAPI_VersionL(); - - void UT_CRtpAPI_RegisterRtpPostProcessingObserverL(); - - void UT_CRtpAPI_SendRtpPacketWithCSRCL(); - - void UT_CRtpAPI_UnregisterRtpPostProcessingObserverL(); + private: // Data @@ -264,9 +256,8 @@ TBuf8<32> iMKI; TBuf8<32> iRFC3711_TestMasterKey128bits; TBuf8<32> iRFC3711_TestMasterSalt112bits; - TBuf8<32> iSalt; + TBuf8<32> iSalt; TBuf8<32> iKey; - TBool iIsCallBackReceived; }; #endif // __UT_CRTPAPI_H__