diff -r b5e99d8877c7 -r 0dcb073356a5 rtp/rtpstack/src/rtpsession.cpp --- a/rtp/rtpstack/src/rtpsession.cpp Tue Aug 31 15:32:57 2010 +0300 +++ b/rtp/rtpstack/src/rtpsession.cpp Wed Sep 01 12:27:36 2010 +0100 @@ -573,23 +573,6 @@ } } - -// --------------------------------------------------------------------------- -// TInt CRtpSession::ReadyToSendRtpPacket() -// -// --------------------------------------------------------------------------- -// -void CRtpSession::ReadyToSendRtpPacket(TRtpId aTranStreamId) - { - if ( iRtpPacketObserver ) - { - RTP_DEBUG_DETAIL("Giving ReadyToSendRtpPacket() Call Back " ); - TPtr8 pktPtr(iPktSnd->Data(), iPktSnd->Size(), iPktSnd->Size()); - iRtpPacketObserver->ReadyToSendRtpPacket( aTranStreamId , pktPtr ); - } - } - - // --------------------------------------------------------------------------- // TInt CRtpSession::SendRtpPacket() // @@ -597,8 +580,7 @@ // TInt CRtpSession::SendRtpPacket( TRtpId aTranStreamId, const TRtpSendHeader& aHeaderInfo, - const TDesC8& aPayloadData, - const TArray *aCsrcList ) + const TDesC8& aPayloadData ) { if ( static_cast (aPayloadData.Size()) > iCommNet->MaxSocketSize() ) { @@ -613,16 +595,12 @@ { CRtpTranStream* tempStream = ( CRtpTranStream* ) streamAddress; tempStream->BuildRtpPacket( aHeaderInfo, aPayloadData, 0, EFalse, - iPktSnd, aCsrcList ); - - ReadyToSendRtpPacket(aTranStreamId); - + iPktSnd ); ret = iCommNet->Send( ERTPPort, iPktSnd->Des() ); } return ret; } - // --------------------------------------------------------------------------- // TInt CRtpSession::SendRtpPacket() // @@ -631,8 +609,7 @@ TInt CRtpSession::SendRtpPacket( TRtpId aTranStreamId, const TRtpSendHeader& aHeaderInfo, const TDesC8& aPayloadData, - TRequestStatus& aStatus, - const TArray *aCsrcList ) + TRequestStatus& aStatus ) { if ( static_cast( aPayloadData.Size() ) > iCommNet->MaxSocketSize() ) { @@ -648,10 +625,7 @@ CRtpTranStream* tempStream = reinterpret_cast( streamAddress ); tempStream->BuildRtpPacket( aHeaderInfo, aPayloadData, 0, EFalse, - iPktSnd, aCsrcList ); - - ReadyToSendRtpPacket(aTranStreamId); - + iPktSnd ); iCommNet->Send( ERTPPort, iPktSnd->Des(), aStatus ); } return ret; @@ -733,8 +707,7 @@ TRtpSequence aSequenceNum, const TRtpSendHeader& aHeaderInfo, const TDesC8& aPayloadData, - TRequestStatus& aStatus, - const TArray *aCsrcList ) + TRequestStatus& aStatus ) { if ( static_cast( aPayloadData.Size() ) > iCommNet->MaxSocketSize() ) { @@ -750,10 +723,7 @@ CRtpTranStream* tempStream = reinterpret_cast( streamAddress ); tempStream->BuildRtpPacket( aHeaderInfo, aPayloadData, aSequenceNum, - ETrue, iPktSnd, aCsrcList ); - - ReadyToSendRtpPacket(aTranStreamId); - + ETrue, iPktSnd ); iCommNet->Send( ERTPPort, iPktSnd->Des(), aStatus ); } return ret; @@ -1176,29 +1146,6 @@ } } - -// --------------------------------------------------------------------------- -// TInt CRtpSession::RegisterRtpPostProcessingObserver() -// -// --------------------------------------------------------------------------- -// -TInt CRtpSession::RegisterRtpPostProcessingObserver( MRtpPostProcessingObserver& aRTPPacketObserver ) - { - iRtpPacketObserver = &aRTPPacketObserver; - - return KErrNone; - } - -// --------------------------------------------------------------------------- -// CRtpSession::UnregisterRtpPostProcessingObserver() -// -// --------------------------------------------------------------------------- -// -void CRtpSession::UnregisterRtpPostProcessingObserver() - { - iRtpPacketObserver = NULL; - } - // --------------------------------------------------------------------------- // TInt CRtpSession::RegisterRtcpObserver() //