[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Sep 9 08:52:15 CDT 2010
branch "master" has been updated
via 7b76891d093e4b14225d71031023a1c864973ffd (commit)
from 5c03f9415a4e69d200c4bad7c74c0a1f192bc8dd (commit)
Summary of changes:
slice | 2 +-
src/MediaRTPpjmedia.cpp | 8 ++++----
src/RTPSession.cpp | 8 ++++----
src/RTPSession.h | 20 ++++++++++----------
src/RTPSink.cpp | 14 +++++++-------
src/RTPSink.h | 10 +++++-----
src/RTPSource.cpp | 14 +++++++-------
src/RTPSource.h | 10 +++++-----
test/TestRTPpjmedia.cpp | 10 +++++-----
9 files changed, 48 insertions(+), 48 deletions(-)
- Log -----------------------------------------------------------------
commit 7b76891d093e4b14225d71031023a1c864973ffd
Author: Joshua Colp <jcolp at digium.com>
Date: Thu Sep 9 10:57:59 2010 -0300
Update to latest slice.
diff --git a/slice b/slice
index dcb271b..14413db 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit dcb271baaca90fa89ed6b7d4846ea458fb303943
+Subproject commit 14413db47bfae3d1ff57d36e80cfe700d755ae0b
diff --git a/src/MediaRTPpjmedia.cpp b/src/MediaRTPpjmedia.cpp
index e4a7c24..177ac91 100644
--- a/src/MediaRTPpjmedia.cpp
+++ b/src/MediaRTPpjmedia.cpp
@@ -21,10 +21,10 @@
#include "RTPSession.h"
using namespace std;
-using namespace Hydra::Core::Discovery::V1;
-using namespace Hydra::Media::V1;
-using namespace Hydra::Media::RTP::V1;
-using namespace Hydra::System::Component::V1;
+using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Media::V1;
+using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::System::Component::V1;
/**
* Implementation of the RTPMediaService interface as defined in MediaRTPIf.ice
diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
index 5a6e654..c11fc56 100644
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@ -19,9 +19,9 @@
#include "RTPSink.h"
using namespace std;
-using namespace Hydra::Core::Discovery::V1;
-using namespace Hydra::Media::V1;
-using namespace Hydra::Media::RTP::V1;
+using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Media::V1;
+using namespace AsteriskSCF::Media::RTP::V1;
/**
* Default value for where we should start allocating RTP and RTCP ports from.
@@ -217,7 +217,7 @@ void RTPSessionImpl::release(const Ice::Current&)
/**
* Implementation of the associatePayloads method as defined in MediaRTPIf.ice
*/
-void RTPSessionImpl::associatePayloads(const Hydra::Media::RTP::V1::PayloadMap& mappings, const Ice::Current&)
+void RTPSessionImpl::associatePayloads(const AsteriskSCF::Media::RTP::V1::PayloadMap& mappings, const Ice::Current&)
{
mImpl->mPayloadstoFormats = mappings;
diff --git a/src/RTPSession.h b/src/RTPSession.h
index 5e45494..93c580e 100644
--- a/src/RTPSession.h
+++ b/src/RTPSession.h
@@ -18,23 +18,23 @@ class RTPSessionImplPriv;
/**
* Implementation of the RTPSession interface as defined in MediaRTPIf.ice
*/
-class RTPSessionImpl : public Hydra::Media::RTP::V1::RTPSession
+class RTPSessionImpl : public AsteriskSCF::Media::RTP::V1::RTPSession
{
public:
- RTPSessionImpl(Ice::ObjectAdapterPtr, const Hydra::Media::V1::FormatSeq&, pj_pool_factory*);
- Hydra::Media::V1::StreamSourceSeq getSources(const Ice::Current&);
- Hydra::Media::V1::StreamSinkSeq getSinks(const Ice::Current&);
+ RTPSessionImpl(Ice::ObjectAdapterPtr, const AsteriskSCF::Media::V1::FormatSeq&, pj_pool_factory*);
+ AsteriskSCF::Media::V1::StreamSourceSeq getSources(const Ice::Current&);
+ AsteriskSCF::Media::V1::StreamSinkSeq getSinks(const Ice::Current&);
std::string getId(const Ice::Current&);
void useRTCP(bool, const Ice::Current&);
- Hydra::Media::RTP::V1::RTCPSessionPrx getRTCPSession(const Ice::Current&);
+ AsteriskSCF::Media::RTP::V1::RTCPSessionPrx getRTCPSession(const Ice::Current&);
void release(const Ice::Current&);
- Hydra::Media::RTP::V1::RTPSessionPrx getProxy();
+ AsteriskSCF::Media::RTP::V1::RTPSessionPrx getProxy();
pjmedia_transport* getTransport();
- Hydra::Media::V1::FormatSeq getFormats();
- void associatePayloads(const Hydra::Media::RTP::V1::PayloadMap&, const Ice::Current&);
+ AsteriskSCF::Media::V1::FormatSeq getFormats();
+ void associatePayloads(const AsteriskSCF::Media::RTP::V1::PayloadMap&, const Ice::Current&);
void setRemoteDetails(std::string address, int port);
- Hydra::Media::V1::FormatPtr getFormat(int payload);
- int getPayload(const Hydra::Media::V1::FormatPtr& mediaformat);
+ AsteriskSCF::Media::V1::FormatPtr getFormat(int payload);
+ int getPayload(const AsteriskSCF::Media::V1::FormatPtr& mediaformat);
private:
/**
* Private implementation data for RTPSessionImpl.
diff --git a/src/RTPSink.cpp b/src/RTPSink.cpp
index 7a17957..9d6745c 100644
--- a/src/RTPSink.cpp
+++ b/src/RTPSink.cpp
@@ -18,9 +18,9 @@
#include "RTPSink.h"
using namespace std;
-using namespace Hydra::Core::Discovery::V1;
-using namespace Hydra::Media::V1;
-using namespace Hydra::Media::RTP::V1;
+using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Media::V1;
+using namespace AsteriskSCF::Media::RTP::V1;
/**
* Private implementation details for the StreamSinkRTPImpl class.
@@ -69,7 +69,7 @@ StreamSinkRTPImpl::StreamSinkRTPImpl(RTPSessionImplPtr session) : mImpl(new Stre
/**
* Implementation of the write method as defined in MediaIf.ice
*/
-void StreamSinkRTPImpl::write(const Hydra::Media::V1::FrameSeq& frames, const Ice::Current&)
+void StreamSinkRTPImpl::write(const AsteriskSCF::Media::V1::FrameSeq& frames, const Ice::Current&)
{
for (FrameSeq::const_iterator frame = frames.begin(); frame != frames.end(); ++frame)
{
@@ -117,7 +117,7 @@ void StreamSinkRTPImpl::write(const Hydra::Media::V1::FrameSeq& frames, const Ic
/**
* Implementation of the setSource method as defined in MediaIf.ice
*/
-void StreamSinkRTPImpl::setSource(const Hydra::Media::V1::StreamSourcePrx& source, const Ice::Current&)
+void StreamSinkRTPImpl::setSource(const AsteriskSCF::Media::V1::StreamSourcePrx& source, const Ice::Current&)
{
mImpl->mSource = source;
}
@@ -125,7 +125,7 @@ void StreamSinkRTPImpl::setSource(const Hydra::Media::V1::StreamSourcePrx& sourc
/**
* Implementation of the getSource method as defined in MediaIf.ice
*/
-Hydra::Media::V1::StreamSourcePrx StreamSinkRTPImpl::getSource(const Ice::Current&)
+AsteriskSCF::Media::V1::StreamSourcePrx StreamSinkRTPImpl::getSource(const Ice::Current&)
{
return mImpl->mSource;
}
@@ -133,7 +133,7 @@ Hydra::Media::V1::StreamSourcePrx StreamSinkRTPImpl::getSource(const Ice::Curren
/**
* Implementation of the getFormats method as defined in MediaIf.ice
*/
-Hydra::Media::V1::FormatSeq StreamSinkRTPImpl::getFormats(const Ice::Current&)
+AsteriskSCF::Media::V1::FormatSeq StreamSinkRTPImpl::getFormats(const Ice::Current&)
{
return mImpl->mSession->getFormats();
}
diff --git a/src/RTPSink.h b/src/RTPSink.h
index fb491be..555e54d 100644
--- a/src/RTPSink.h
+++ b/src/RTPSink.h
@@ -18,14 +18,14 @@ class StreamSinkRTPImplPriv;
/**
* Implementation of the StreamSourceRTP interface as defined in MediaRTPIf.ice
*/
-class StreamSinkRTPImpl : public Hydra::Media::RTP::V1::StreamSinkRTP
+class StreamSinkRTPImpl : public AsteriskSCF::Media::RTP::V1::StreamSinkRTP
{
public:
StreamSinkRTPImpl(RTPSessionImplPtr);
- void write(const Hydra::Media::V1::FrameSeq&, const Ice::Current&);
- void setSource(const Hydra::Media::V1::StreamSourcePrx&, const Ice::Current&);
- Hydra::Media::V1::StreamSourcePrx getSource(const Ice::Current&);
- Hydra::Media::V1::FormatSeq getFormats(const Ice::Current&);
+ void write(const AsteriskSCF::Media::V1::FrameSeq&, const Ice::Current&);
+ void setSource(const AsteriskSCF::Media::V1::StreamSourcePrx&, const Ice::Current&);
+ AsteriskSCF::Media::V1::StreamSourcePrx getSource(const Ice::Current&);
+ AsteriskSCF::Media::V1::FormatSeq getFormats(const Ice::Current&);
std::string getId(const Ice::Current&);
void setRemoteDetails(const std::string&, Ice::Int, const Ice::Current&);
std::string getRemoteAddress(const Ice::Current&);
diff --git a/src/RTPSource.cpp b/src/RTPSource.cpp
index e0c7779..1f9eddf 100644
--- a/src/RTPSource.cpp
+++ b/src/RTPSource.cpp
@@ -18,9 +18,9 @@
#include "RTPSource.h"
using namespace std;
-using namespace Hydra::Core::Discovery::V1;
-using namespace Hydra::Media::V1;
-using namespace Hydra::Media::RTP::V1;
+using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Media::V1;
+using namespace AsteriskSCF::Media::RTP::V1;
/**
* Private implementation details for the StreamSourceRTPImpl class.
@@ -59,7 +59,7 @@ StreamSourceRTPImpl::StreamSourceRTPImpl(RTPSessionImplPtr session) : mImpl(new
/**
* Implementation of the setSink method as defined in MediaIf.ice
*/
-void StreamSourceRTPImpl::setSink(const Hydra::Media::V1::StreamSinkPrx& sink, const Ice::Current&)
+void StreamSourceRTPImpl::setSink(const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&)
{
mImpl->mSink = sink;
}
@@ -67,7 +67,7 @@ void StreamSourceRTPImpl::setSink(const Hydra::Media::V1::StreamSinkPrx& sink, c
/**
* Implementation of the getSink method as defined in MediaIf.ice
*/
-Hydra::Media::V1::StreamSinkPrx StreamSourceRTPImpl::getSink(const Ice::Current&)
+AsteriskSCF::Media::V1::StreamSinkPrx StreamSourceRTPImpl::getSink(const Ice::Current&)
{
return mImpl->mSink;
}
@@ -75,7 +75,7 @@ Hydra::Media::V1::StreamSinkPrx StreamSourceRTPImpl::getSink(const Ice::Current&
/**
* Implementation of the getFormats method as defined in MediaIf.ice
*/
-Hydra::Media::V1::FormatSeq StreamSourceRTPImpl::getFormats(const Ice::Current&)
+AsteriskSCF::Media::V1::FormatSeq StreamSourceRTPImpl::getFormats(const Ice::Current&)
{
return mImpl->mSession->getFormats();
}
@@ -92,7 +92,7 @@ std::string StreamSourceRTPImpl::getId(const Ice::Current& current)
/**
* Implementation of the requestMethod method as defined in MediaIf.ice
*/
-void StreamSourceRTPImpl::requestFormat(const Hydra::Media::V1::FormatPtr&, const Ice::Current&)
+void StreamSourceRTPImpl::requestFormat(const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&)
{
/* We do not currently support switching formats. */
throw new MediaFormatSwitchException();
diff --git a/src/RTPSource.h b/src/RTPSource.h
index 4d634cd..ab74e14 100644
--- a/src/RTPSource.h
+++ b/src/RTPSource.h
@@ -18,15 +18,15 @@ class StreamSourceRTPImplPriv;
/**
* Implementation of the StreamSourceRTP interface as defined in MediaRTPIf.ice
*/
-class StreamSourceRTPImpl : public Hydra::Media::RTP::V1::StreamSourceRTP
+class StreamSourceRTPImpl : public AsteriskSCF::Media::RTP::V1::StreamSourceRTP
{
public:
StreamSourceRTPImpl(RTPSessionImplPtr);
- void setSink(const Hydra::Media::V1::StreamSinkPrx&, const Ice::Current&);
- Hydra::Media::V1::StreamSinkPrx getSink(const Ice::Current&);
- Hydra::Media::V1::FormatSeq getFormats(const Ice::Current&);
+ void setSink(const AsteriskSCF::Media::V1::StreamSinkPrx&, const Ice::Current&);
+ AsteriskSCF::Media::V1::StreamSinkPrx getSink(const Ice::Current&);
+ AsteriskSCF::Media::V1::FormatSeq getFormats(const Ice::Current&);
std::string getId(const Ice::Current&);
- void requestFormat(const Hydra::Media::V1::FormatPtr&, const Ice::Current&);
+ void requestFormat(const AsteriskSCF::Media::V1::FormatPtr&, const Ice::Current&);
std::string getLocalAddress(const Ice::Current&);
Ice::Int getLocalPort(const Ice::Current&);
void setRemoteDetails(std::string address, int port);
diff --git a/test/TestRTPpjmedia.cpp b/test/TestRTPpjmedia.cpp
index 4468c33..b98fb2a 100644
--- a/test/TestRTPpjmedia.cpp
+++ b/test/TestRTPpjmedia.cpp
@@ -21,9 +21,9 @@
#include "Media/RTP/MediaRTPIf.h"
using namespace std;
-using namespace Hydra::Core::Discovery::V1;
-using namespace Hydra::Media::V1;
-using namespace Hydra::Media::RTP::V1;
+using namespace AsteriskSCF::Core::Discovery::V1;
+using namespace AsteriskSCF::Media::V1;
+using namespace AsteriskSCF::Media::RTP::V1;
/* Cache the command line arguments so that Ice can be initialized within the global fixture. */
struct ArgCacheType
@@ -79,7 +79,7 @@ public:
/**
* Implementation of the write method which doesn't really do anything yet.
*/
- void write(const Hydra::Media::V1::FrameSeq& frames, const Ice::Current&)
+ void write(const AsteriskSCF::Media::V1::FrameSeq& frames, const Ice::Current&)
{
Testbed.frames = frames;
}
@@ -87,7 +87,7 @@ public:
/**
* Implementation of the setSource method which just stores the source away for later retrieval.
*/
- void setSource(const Hydra::Media::V1::StreamSourcePrx& source, const Ice::Current&)
+ void setSource(const AsteriskSCF::Media::V1::StreamSourcePrx& source, const Ice::Current&)
{
mSource = source;
}
-----------------------------------------------------------------------
--
asterisk-scf/integration/media_rtp_pjmedia.git
More information about the asterisk-scf-commits
mailing list