[asterisk-scf-commits] asterisk-scf/release/media_rtp_pjmedia.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Aug 1 18:22:36 CDT 2011
branch "master" has been updated
via 5cdf85964506bafba2394abb55b1982b910dfa03 (commit)
from cdfa9be9fd76f722c1a801b8ecd0f1960ae543bd (commit)
Summary of changes:
.../MediaRTPPJMedia/RtpStateReplicationIf.ice | 36 +++++++-------
src/MediaRTPpjmedia.cpp | 18 ++++----
src/RTPSession.cpp | 50 ++++++++++----------
src/RTPSink.cpp | 28 ++++++------
src/RTPSource.cpp | 26 +++++-----
src/RtpStateReplicatorApp.cpp | 2 +-
src/RtpStateReplicatorListener.cpp | 12 ++--
test/TestRTPpjmedia.cpp | 36 +++++++-------
8 files changed, 104 insertions(+), 104 deletions(-)
- Log -----------------------------------------------------------------
commit 5cdf85964506bafba2394abb55b1982b910dfa03
Author: Mark Michelson <mmichelson at digium.com>
Date: Mon Aug 1 17:45:25 2011 -0500
Remove unnecessary 'm' prefix on slice data members.
diff --git a/slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice b/slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice
index f3aae1f..4c44683 100644
--- a/slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice
+++ b/slice/AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice
@@ -41,7 +41,7 @@ module V1
unsliceable class RtpStateReplicatorParams extends AsteriskSCF::Core::Discovery::V1::ServiceLocatorParams
{
- string mName;
+ string name;
};
["visitor"] local class RtpStateItemVisitor
@@ -51,7 +51,7 @@ module V1
["visitor:RtpStateItemVisitor"] class RtpStateItem
{
string key;
- string mSessionId;
+ string sessionId;
};
sequence<RtpStateItem> RtpStateItemSeq;
@@ -74,8 +74,8 @@ module V1
class RtpGeneralStateItem extends RtpStateItem
{
- AsteriskSCF::Core::Discovery::V1::ServiceManagement *mServiceManagement;
- string mComparatorId;
+ AsteriskSCF::Core::Discovery::V1::ServiceManagement *serviceManagement;
+ string comparatorId;
};
/**
@@ -83,28 +83,28 @@ module V1
*/
class RtpSessionStateItem extends RtpStateItem
{
- Ice::Identity mSessionIdentity;
- int mPort;
- Ice::Identity mSinkIdentity;
- Ice::Identity mSourceIdentity;
- AsteriskSCF::Media::V1::FormatSeq mFormats;
- AsteriskSCF::Media::RTP::V1::PayloadMap mPayloadstoFormats;
- bool mIPv6;
- bool mSRTP;
- string mRemoteRtcpAddress;
- int mRemoteRtcpPort;
+ Ice::Identity sessionIdentity;
+ int port;
+ Ice::Identity sinkIdentity;
+ Ice::Identity sourceIdentity;
+ AsteriskSCF::Media::V1::FormatSeq formats;
+ AsteriskSCF::Media::RTP::V1::PayloadMap payloadstoFormats;
+ bool ipv6;
+ bool srtp;
+ string remoteRtcpAddress;
+ int remoteRtcpPort;
};
class RtpStreamSinkStateItem extends RtpStateItem
{
- AsteriskSCF::Media::V1::StreamSource *mSource;
- string mRemoteAddress;
- int mRemotePort;
+ AsteriskSCF::Media::V1::StreamSource *source;
+ string remoteAddress;
+ int remotePort;
};
class RtpStreamSourceStateItem extends RtpStateItem
{
- AsteriskSCF::Media::V1::StreamSinkSeq mSinks;
+ AsteriskSCF::Media::V1::StreamSinkSeq sinks;
};
}; /* module V1 */
diff --git a/src/MediaRTPpjmedia.cpp b/src/MediaRTPpjmedia.cpp
index c8304b3..9b2933f 100644
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@ -361,7 +361,7 @@ public:
*/
virtual void suspend(const ::Ice::Current&)
{
- mGeneralState->mServiceManagement->suspend();
+ mGeneralState->serviceManagement->suspend();
}
/**
@@ -370,7 +370,7 @@ public:
*/
virtual void resume(const ::Ice::Current&)
{
- mGeneralState->mServiceManagement->unsuspend();
+ mGeneralState->serviceManagement->unsuspend();
}
/**
@@ -555,7 +555,7 @@ void MediaRTPpjmediaApp::start(const std::string&, const Ice::CommunicatorPtr& c
// Look for the configured state replicator or default one
RtpStateReplicatorParamsPtr replicatorParams = new RtpStateReplicatorParams();
replicatorParams->category = StateReplicatorDiscoveryCategory;
- replicatorParams->mName =
+ replicatorParams->name =
mCommunicator->getProperties()->getPropertyWithDefault("Rtp.StateReplicatorName", "default");
try
@@ -624,8 +624,8 @@ void MediaRTPpjmediaApp::start(const std::string&, const Ice::CommunicatorPtr& c
if (mReplicaService->isActive() == true)
{
- mGeneralState->mComparatorId = IceUtil::generateUUID();
- mManagement->addCompare(mGeneralState->mComparatorId, RTPMediaComparatorServiceProxy);
+ mGeneralState->comparatorId = IceUtil::generateUUID();
+ mManagement->addCompare(mGeneralState->comparatorId, RTPMediaComparatorServiceProxy);
}
@@ -654,10 +654,10 @@ void MediaRTPpjmediaApp::start(const std::string&, const Ice::CommunicatorPtr& c
if (mReplicaService->isActive() == true)
{
- mGeneralState->mServiceManagement = ServiceManagementPrx::uncheckedCast(
+ mGeneralState->serviceManagement = ServiceManagementPrx::uncheckedCast(
mManagement->addService(RTPMediaServiceProxy, "media_rtp_pjmedia"));
/* Now we can add some parameters to help find us. */
- mGeneralState->mServiceManagement->addLocatorParams(rtpparams, mGeneralState->mComparatorId);
+ mGeneralState->serviceManagement->addLocatorParams(rtpparams, mGeneralState->comparatorId);
}
ServiceLocatorParamsPtr genericparams = new ServiceLocatorParams();
@@ -691,7 +691,7 @@ void MediaRTPpjmediaApp::stop()
mComponentServiceManagement->unregister();
if (mReplicaService->isActive() == true)
{
- mGeneralState->mServiceManagement->unregister();
+ mGeneralState->serviceManagement->unregister();
}
if (mConfigurationManagement)
{
@@ -702,7 +702,7 @@ void MediaRTPpjmediaApp::stop()
mManagement->removeCompare(mConfigCompareGuid);
ServiceLocatorManagementPrx management =
ServiceLocatorManagementPrx::checkedCast(mCommunicator->propertyToProxy("ServiceLocatorManagementProxy"));
- management->removeCompare(mGeneralState->mComparatorId);
+ management->removeCompare(mGeneralState->comparatorId);
}
mCommunicator->destroy();
}
diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
index 69c1fea..ccf8064 100644
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@ -468,18 +468,18 @@ RTPSessionImpl::RTPSessionImpl(const Ice::ObjectAdapterPtr& adapter,
if (mEnvironment->srtpConfig() && mEnvironment->srtpConfig()->isSRTPEnabled() && params->srtpCapable)
{
mTransport = SRTPTransport::create(mTransport, mEndpoint, configurationService);
- mSessionStateItem->mSRTP = true;
+ mSessionStateItem->srtp = true;
}
else
{
- mSessionStateItem->mSRTP = false;
+ mSessionStateItem->srtp = false;
}
// Initialize our session state item enough so that the state items for the source and sink can also be initialized.
- mSessionStateItem->key = mSessionStateItem->mSessionId = IceUtil::generateUUID();
- mSessionStateItem->mSessionIdentity = mAdapter->getCommunicator()->stringToIdentity(mId);
- mSessionStateItem->mFormats = params->formats;
- mSessionStateItem->mIPv6 = params->ipv6;
+ mSessionStateItem->key = mSessionStateItem->sessionId = IceUtil::generateUUID();
+ mSessionStateItem->sessionIdentity = mAdapter->getCommunicator()->stringToIdentity(mId);
+ mSessionStateItem->formats = params->formats;
+ mSessionStateItem->ipv6 = params->ipv6;
pjmedia_rtcp_init(&mRtcpSession, NULL, 8000, 160, 0);
}
@@ -594,7 +594,7 @@ void RTPSessionImpl::release(const Ice::Current&)
*/
void RTPSessionImpl::associatePayloads(const AsteriskSCF::Media::RTP::V1::PayloadMap& mappings, const Ice::Current&)
{
- mSessionStateItem->mPayloadstoFormats = mappings;
+ mSessionStateItem->payloadstoFormats = mappings;
associatePayloadsImpl(mappings);
// Only the session has changed so push a single update out for it
@@ -710,9 +710,9 @@ void RTPSessionImpl::setRemoteRtcpDetails(const std::string& address, Ice::Int p
*/
FormatPtr RTPSessionImpl::getFormat(int payload)
{
- PayloadMap::iterator it = mSessionStateItem->mPayloadstoFormats.find(payload);
+ PayloadMap::iterator it = mSessionStateItem->payloadstoFormats.find(payload);
- if (it == mSessionStateItem->mPayloadstoFormats.end())
+ if (it == mSessionStateItem->payloadstoFormats.end())
{
return 0;
}
@@ -878,18 +878,18 @@ RTPSessionPrx RTPSessionImpl::activate(const Ice::Identity& id, const Ice::Ident
if (mSessionStateItem)
{
- mSessionStateItem->key = mSessionStateItem->mSessionId = mId;
- mSessionStateItem->mSessionIdentity = id;
- mSessionStateItem->mFormats = mFormats;
- mSessionStateItem->mSourceIdentity = sourceId;
- mSessionStateItem->mSinkIdentity = sinkId;
+ mSessionStateItem->key = mSessionStateItem->sessionId = mId;
+ mSessionStateItem->sessionIdentity = id;
+ mSessionStateItem->formats = mFormats;
+ mSessionStateItem->sourceIdentity = sourceId;
+ mSessionStateItem->sinkIdentity = sinkId;
if (mTransport->localAddress())
{
- mSessionStateItem->mPort = mTransport->localAddress()->port();
+ mSessionStateItem->port = mTransport->localAddress()->port();
}
else
{
- mSessionStateItem->mPort = 0;
+ mSessionStateItem->port = 0;
}
replicateState(mSessionStateItem, mStreamSink->getStateItem(), mStreamSource->getStateItem());
}
@@ -933,20 +933,20 @@ public:
void update(const RtpSessionStateItemPtr& item)
{
- mImpl->associatePayloadsImpl(item->mPayloadstoFormats);
- mImpl->setRemoteRtcpDetails(item->mRemoteRtcpAddress, item->mRemoteRtcpPort);
+ mImpl->associatePayloadsImpl(item->payloadstoFormats);
+ mImpl->setRemoteRtcpDetails(item->remoteRtcpAddress, item->remoteRtcpPort);
}
void update(const RtpStreamSinkStateItemPtr& item)
{
- mImpl->getSinkServant()->setSourceImpl(item->mSource);
- mImpl->getSinkServant()->setRemoteDetailsImpl(item->mRemoteAddress, item->mRemotePort);
- mImpl->getSourceServant()->setRemoteDetails(item->mRemoteAddress, item->mRemotePort);
+ mImpl->getSinkServant()->setSourceImpl(item->source);
+ mImpl->getSinkServant()->setRemoteDetailsImpl(item->remoteAddress, item->remotePort);
+ mImpl->getSourceServant()->setRemoteDetails(item->remoteAddress, item->remotePort);
}
void update(const RtpStreamSourceStateItemPtr& item)
{
- mImpl->getSourceServant()->setSinksImpl(item->mSinks);
+ mImpl->getSourceServant()->setSinksImpl(item->sinks);
}
void destroy()
@@ -981,12 +981,12 @@ ReplicationAdapterPtr AsteriskSCF::PJMediaRTP::RTPSession::create(const Ice::Obj
const ConfigurationServiceImplPtr& configuration)
{
RTPSessionImplPtr servant(new RTPSessionImpl(adapter,
- adapter->getCommunicator()->identityToString(item->mSessionIdentity),
+ adapter->getCommunicator()->identityToString(item->sessionIdentity),
environment,
- item->mPort, item->mFormats, item->mIPv6, item->mSRTP,
+ item->port, item->formats, item->ipv6, item->srtp,
AsteriskSCF::Discovery::SmartProxy<RtpStateReplicatorPrx>(),
configuration));
- servant->activate(item->mSessionIdentity, item-> mSourceIdentity, item->mSinkIdentity);
+ servant->activate(item->sessionIdentity, item->sourceIdentity, item->sinkIdentity);
return ReplicationAdapterPtr(new ReplicationAdapterImpl(servant));
}
diff --git a/src/RTPSink.cpp b/src/RTPSink.cpp
index 8184c1a..687ded0 100644
--- a/src/RTPSink.cpp
+++ b/src/RTPSink.cpp
@@ -79,9 +79,9 @@ StreamSinkRTPImplPriv::StreamSinkRTPImplPriv(const SessionAdapterPtr& session,
mSessionId(sessionId)
{
pjmedia_rtp_session_init(&mOutgoingSession, 0, pj_rand());
- mSinkStateItem->mSessionId = sessionId;
+ mSinkStateItem->sessionId = sessionId;
mSinkStateItem->key = IceUtil::generateUUID();
- mSinkStateItem->mRemotePort = 0;
+ mSinkStateItem->remotePort = 0;
};
/**
@@ -99,7 +99,7 @@ StreamSinkRTPImpl::StreamSinkRTPImpl(const SessionAdapterPtr& session, const PJM
void StreamSinkRTPImpl::write(const AsteriskSCF::Media::V1::FrameSeq& frames, const Ice::Current&)
{
// Don't even bother if no remote address information is present
- if (mImpl->mSinkStateItem->mRemoteAddress.empty() || !mImpl->mSinkStateItem->mRemotePort)
+ if (mImpl->mSinkStateItem->remoteAddress.empty() || !mImpl->mSinkStateItem->remotePort)
{
return;
}
@@ -165,7 +165,7 @@ void StreamSinkRTPImpl::write(const AsteriskSCF::Media::V1::FrameSeq& frames, co
*/
void StreamSinkRTPImpl::setSource(const AsteriskSCF::Media::V1::StreamSourcePrx& source, const Ice::Current&)
{
- mImpl->mSinkStateItem->mSource = source;
+ mImpl->mSinkStateItem->source = source;
mImpl->mSessionAdapter->replicateState(mImpl->mSinkStateItem);
}
@@ -175,7 +175,7 @@ void StreamSinkRTPImpl::setSource(const AsteriskSCF::Media::V1::StreamSourcePrx&
*/
AsteriskSCF::Media::V1::StreamSourcePrx StreamSinkRTPImpl::getSource(const Ice::Current&)
{
- return mImpl->mSinkStateItem->mSource;
+ return mImpl->mSinkStateItem->source;
}
/**
@@ -208,8 +208,8 @@ void StreamSinkRTPImpl::setRemoteDetails(const string& address, Ice::Int port, c
/* We do store it though in case we have not yet received a packet from the remote side but
* are asked for the remote address. It is also stored for replication purposes.
*/
- mImpl->mSinkStateItem->mRemoteAddress = address;
- mImpl->mSinkStateItem->mRemotePort = port;
+ mImpl->mSinkStateItem->remoteAddress = address;
+ mImpl->mSinkStateItem->remotePort = port;
mImpl->mSessionAdapter->replicateState(mImpl->mSinkStateItem);
}
@@ -222,9 +222,9 @@ std::string StreamSinkRTPImpl::getRemoteAddress(const Ice::Current&)
if (mImpl->mTransport && mImpl->mTransport->remoteAddress())
{
string address = mImpl->mTransport->remoteAddress()->hostname();
- return (address != "0.0.0.0") ? address : mImpl->mSinkStateItem->mRemoteAddress;
+ return (address != "0.0.0.0") ? address : mImpl->mSinkStateItem->remoteAddress;
}
- return mImpl->mSinkStateItem->mRemoteAddress;
+ return mImpl->mSinkStateItem->remoteAddress;
}
/**
@@ -235,9 +235,9 @@ Ice::Int StreamSinkRTPImpl::getRemotePort(const Ice::Current&)
if (mImpl->mTransport && mImpl->mTransport->remoteAddress())
{
int port = mImpl->mTransport->remoteAddress()->port();
- return (port != 0) ? port : mImpl->mSinkStateItem->mRemotePort;
+ return (port != 0) ? port : mImpl->mSinkStateItem->remotePort;
}
- return mImpl->mSinkStateItem->mRemotePort;
+ return mImpl->mSinkStateItem->remotePort;
}
/**
@@ -250,11 +250,11 @@ RtpStreamSinkStateItemPtr StreamSinkRTPImpl::getStateItem()
void StreamSinkRTPImpl::setRemoteDetailsImpl(const std::string& host, Ice::Int port)
{
- mImpl->mSinkStateItem->mRemoteAddress = host;
- mImpl->mSinkStateItem->mRemotePort = port;
+ mImpl->mSinkStateItem->remoteAddress = host;
+ mImpl->mSinkStateItem->remotePort = port;
}
void StreamSinkRTPImpl::setSourceImpl(const AsteriskSCF::Media::V1::StreamSourcePrx& proxy)
{
- mImpl->mSinkStateItem->mSource = proxy;
+ mImpl->mSinkStateItem->source = proxy;
}
diff --git a/src/RTPSource.cpp b/src/RTPSource.cpp
index 4ae46f9..8f501a9 100644
--- a/src/RTPSource.cpp
+++ b/src/RTPSource.cpp
@@ -181,7 +181,7 @@ StreamSourceRTPImplPriv::StreamSourceRTPImplPriv(const SessionAdapterPtr& sessio
mSink(sink)
{
pjmedia_rtp_session_init(&mIncomingSession, 0, 0);
- mSourceStateItem->mSessionId = sessionId;
+ mSourceStateItem->sessionId = sessionId;
mSourceStateItem->key = IceUtil::generateUUID();
}
@@ -216,15 +216,15 @@ void StreamSourceRTPImpl::addSink(const AsteriskSCF::Media::V1::StreamSinkPrx& s
boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
// Do not allow the same sink to be added multiple times
- if (std::find(mImpl->mSourceStateItem->mSinks.begin(),
- mImpl->mSourceStateItem->mSinks.end(),
+ if (std::find(mImpl->mSourceStateItem->sinks.begin(),
+ mImpl->mSourceStateItem->sinks.end(),
sink) !=
- mImpl->mSourceStateItem->mSinks.end())
+ mImpl->mSourceStateItem->sinks.end())
{
return;
}
- mImpl->mSourceStateItem->mSinks.push_back(sink);
+ mImpl->mSourceStateItem->sinks.push_back(sink);
mImpl->mSessionAdapter->replicateState(mImpl->mSourceStateItem);
}
@@ -236,9 +236,9 @@ void StreamSourceRTPImpl::removeSink(const AsteriskSCF::Media::V1::StreamSinkPrx
{
boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- mImpl->mSourceStateItem->mSinks.erase(std::remove(mImpl->mSourceStateItem->mSinks.begin(),
- mImpl->mSourceStateItem->mSinks.end(),
- sink), mImpl->mSourceStateItem->mSinks.end());
+ mImpl->mSourceStateItem->sinks.erase(std::remove(mImpl->mSourceStateItem->sinks.begin(),
+ mImpl->mSourceStateItem->sinks.end(),
+ sink), mImpl->mSourceStateItem->sinks.end());
mImpl->mSessionAdapter->replicateState(mImpl->mSourceStateItem);
}
@@ -248,7 +248,7 @@ void StreamSourceRTPImpl::removeSink(const AsteriskSCF::Media::V1::StreamSinkPrx
*/
AsteriskSCF::Media::V1::StreamSinkSeq StreamSourceRTPImpl::getSinks(const Ice::Current&)
{
- return mImpl->mSourceStateItem->mSinks;
+ return mImpl->mSourceStateItem->sinks;
}
/**
@@ -356,7 +356,7 @@ static void receiveRTP(void *userdata, void *packet, pj_ssize_t size)
}
}
- if (source->mImpl->mSourceStateItem->mSinks.empty())
+ if (source->mImpl->mSourceStateItem->sinks.empty())
{
// No sinks present so frames can not go anywhere
return;
@@ -408,8 +408,8 @@ static void receiveRTP(void *userdata, void *packet, pj_ssize_t size)
boost::shared_lock<boost::shared_mutex> lock(source->mImpl->mLock);
- for (StreamSinkSeq::iterator sink = source->mImpl->mSourceStateItem->mSinks.begin();
- sink != source->mImpl->mSourceStateItem->mSinks.end();
+ for (StreamSinkSeq::iterator sink = source->mImpl->mSourceStateItem->sinks.begin();
+ sink != source->mImpl->mSourceStateItem->sinks.end();
++sink)
{
try
@@ -570,5 +570,5 @@ RtpStreamSourceStateItemPtr StreamSourceRTPImpl::getStateItem()
void StreamSourceRTPImpl::setSinksImpl(const AsteriskSCF::Media::V1::StreamSinkSeq& sinks)
{
boost::unique_lock<boost::shared_mutex> lock(mImpl->mLock);
- mImpl->mSourceStateItem->mSinks = sinks;
+ mImpl->mSourceStateItem->sinks = sinks;
}
diff --git a/src/RtpStateReplicatorApp.cpp b/src/RtpStateReplicatorApp.cpp
index 7c97d4d..8d5129b 100644
--- a/src/RtpStateReplicatorApp.cpp
+++ b/src/RtpStateReplicatorApp.cpp
@@ -118,7 +118,7 @@ public:
bool isSupported(const ServiceLocatorParamsPtr ¶ms, const Ice::Current &)
{
RtpStateReplicatorParamsPtr sipParams = RtpStateReplicatorParamsPtr::dynamicCast(params);
- if (sipParams->mName == mName)
+ if (sipParams->name == mName)
{
return true;
}
diff --git a/src/RtpStateReplicatorListener.cpp b/src/RtpStateReplicatorListener.cpp
index 9ceb5a5..e441f41 100644
--- a/src/RtpStateReplicatorListener.cpp
+++ b/src/RtpStateReplicatorListener.cpp
@@ -91,20 +91,20 @@ public:
void visitRtpGeneralStateItem(const RtpGeneralStateItemPtr &item)
{
- mImpl->mGeneralState->mServiceManagement = item->mServiceManagement;
- mImpl->mGeneralState->mComparatorId = item->mComparatorId;
+ mImpl->mGeneralState->serviceManagement = item->serviceManagement;
+ mImpl->mGeneralState->comparatorId = item->comparatorId;
}
void visitRtpSessionStateItem(const RtpSessionStateItemPtr &item)
{
- map<string, boost::shared_ptr<RtpStateReplicatorItem> >::iterator i = mImpl->mStateItems.find(item->mSessionId);
+ map<string, boost::shared_ptr<RtpStateReplicatorItem> >::iterator i = mImpl->mStateItems.find(item->sessionId);
boost::shared_ptr<RtpStateReplicatorItem> localitem;
if (i == mImpl->mStateItems.end())
{
boost::shared_ptr<RtpStateReplicatorItem> newitem(new RtpStateReplicatorItem());
localitem = newitem;
- mImpl->mStateItems.insert(make_pair(item->mSessionId, newitem));
+ mImpl->mStateItems.insert(make_pair(item->sessionId, newitem));
localitem->setSession(
AsteriskSCF::PJMediaRTP::RTPSession::create(mImpl->mAdapter, mImpl->mEnvironment, item,
@@ -128,7 +128,7 @@ public:
void visitRtpStreamSinkStateItem(const RtpStreamSinkStateItemPtr &item)
{
map<string, boost::shared_ptr<RtpStateReplicatorItem> >::iterator i =
- mImpl->mStateItems.find(item->mSessionId);
+ mImpl->mStateItems.find(item->sessionId);
if (i != mImpl->mStateItems.end())
{
i->second->getSession()->update(item);
@@ -138,7 +138,7 @@ public:
void visitRtpStreamSourceStateItem(const RtpStreamSourceStateItemPtr &item)
{
map<string, boost::shared_ptr<RtpStateReplicatorItem> >::iterator i =
- mImpl->mStateItems.find(item->mSessionId);
+ mImpl->mStateItems.find(item->sessionId);
if (i != mImpl->mStateItems.end())
{
i->second->getSession()->update(item);
diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index ca15d65..c6c9615 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -393,7 +393,7 @@ BOOST_AUTO_TEST_CASE(ReplicatorFound)
{
RtpStateReplicatorParamsPtr params = new RtpStateReplicatorParams();
params->category = StateReplicatorDiscoveryCategory;
- params->mName = "default";
+ params->name = "default";
Testbed.mStateReplicator = RtpStateReplicatorPrx::uncheckedCast(Testbed.locator->locate(params));
@@ -450,8 +450,8 @@ BOOST_AUTO_TEST_CASE(CheckReplicatedGeneralStateItem)
}
BOOST_CHECK(Testbed.mListener->mGeneral);
- BOOST_CHECK(Testbed.mListener->mGeneral->mServiceManagement);
- BOOST_CHECK(Testbed.mListener->mGeneral->mComparatorId.size());
+ BOOST_CHECK(Testbed.mListener->mGeneral->serviceManagement);
+ BOOST_CHECK(Testbed.mListener->mGeneral->comparatorId.size());
}
/**
@@ -506,25 +506,25 @@ BOOST_AUTO_TEST_CASE(AllocateRTPSession)
BOOST_AUTO_TEST_CASE(ConfirmInitialReplicatedRTPSession)
{
BOOST_CHECK(Testbed.mListener->mSession);
- BOOST_CHECK(Testbed.mListener->mSession->mSessionIdentity == Testbed.session->ice_getIdentity());
+ BOOST_CHECK(Testbed.mListener->mSession->sessionIdentity == Testbed.session->ice_getIdentity());
#ifdef IPV6_TEST
- BOOST_CHECK(Testbed.mListener->mSession->mIPv6 == true);
+ BOOST_CHECK(Testbed.mListener->mSession->ipv6 == true);
#else
- BOOST_CHECK(Testbed.mListener->mSession->mIPv6 == false);
+ BOOST_CHECK(Testbed.mListener->mSession->ipv6 == false);
#endif
StreamSinkSeq sinks = Testbed.session->getSinks();
StreamSinkRTPPrx sink = StreamSinkRTPPrx::uncheckedCast(sinks.front());
- BOOST_CHECK(Testbed.mListener->mSession->mSinkIdentity == sink->ice_getIdentity());
+ BOOST_CHECK(Testbed.mListener->mSession->sinkIdentity == sink->ice_getIdentity());
StreamSourceSeq sources = Testbed.session->getSources();
StreamSourceRTPPrx source = StreamSourceRTPPrx::uncheckedCast(sources.front());
- BOOST_CHECK(Testbed.mListener->mSession->mSourceIdentity == source->ice_getIdentity());
- BOOST_CHECK(Testbed.mListener->mSession->mPort == source->getLocalPort());
+ BOOST_CHECK(Testbed.mListener->mSession->sourceIdentity == source->ice_getIdentity());
+ BOOST_CHECK(Testbed.mListener->mSession->port == source->getLocalPort());
- BOOST_CHECK(!Testbed.mListener->mSession->mRemoteRtcpAddress.size());
- BOOST_CHECK(!Testbed.mListener->mSession->mRemoteRtcpPort);
+ BOOST_CHECK(!Testbed.mListener->mSession->remoteRtcpAddress.size());
+ BOOST_CHECK(!Testbed.mListener->mSession->remoteRtcpPort);
}
/**
@@ -533,9 +533,9 @@ BOOST_AUTO_TEST_CASE(ConfirmInitialReplicatedRTPSession)
BOOST_AUTO_TEST_CASE(ConfirmInitialReplicatedRTPSink)
{
BOOST_CHECK(Testbed.mListener->mSink);
- BOOST_CHECK(!Testbed.mListener->mSink->mSource);
- BOOST_CHECK(!Testbed.mListener->mSink->mRemoteAddress.size());
- BOOST_CHECK(!Testbed.mListener->mSink->mRemotePort);
+ BOOST_CHECK(!Testbed.mListener->mSink->source);
+ BOOST_CHECK(!Testbed.mListener->mSink->remoteAddress.size());
+ BOOST_CHECK(!Testbed.mListener->mSink->remotePort);
}
/**
@@ -544,7 +544,7 @@ BOOST_AUTO_TEST_CASE(ConfirmInitialReplicatedRTPSink)
BOOST_AUTO_TEST_CASE(ConfirmInitialReplicatedRTPSource)
{
BOOST_CHECK(Testbed.mListener->mSource);
- BOOST_CHECK(Testbed.mListener->mSource->mSinks.empty());
+ BOOST_CHECK(Testbed.mListener->mSource->sinks.empty());
}
/**
@@ -1038,8 +1038,8 @@ BOOST_AUTO_TEST_CASE(ConfirmPopulatedReplicatedRTPSink)
StreamSourceSeq sources = Testbed.session->getSources();
StreamSourceRTPPrx source = StreamSourceRTPPrx::uncheckedCast(sources.front());
- BOOST_CHECK(Testbed.mListener->mSink->mRemoteAddress == source->getLocalAddress());
- BOOST_CHECK(Testbed.mListener->mSink->mRemotePort == source->getLocalPort());
+ BOOST_CHECK(Testbed.mListener->mSink->remoteAddress == source->getLocalAddress());
+ BOOST_CHECK(Testbed.mListener->mSink->remotePort == source->getLocalPort());
}
/**
@@ -1047,7 +1047,7 @@ BOOST_AUTO_TEST_CASE(ConfirmPopulatedReplicatedRTPSink)
*/
BOOST_AUTO_TEST_CASE(ConfirmPopulatedReplicatedRTPSource)
{
- BOOST_CHECK(Testbed.mListener->mSource->mSinks.front() == Testbed.sink);
+ BOOST_CHECK(Testbed.mListener->mSource->sinks.front() == Testbed.sink);
}
/**
-----------------------------------------------------------------------
--
asterisk-scf/release/media_rtp_pjmedia.git
More information about the asterisk-scf-commits
mailing list