[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "modular-transport-refactor" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Jun 27 10:25:34 CDT 2011
branch "modular-transport-refactor" has been updated
via 27e3d57021068a4b988988880d6fa9e055d45e6f (commit)
via 4072e2883499920c2343700761799fafccce6873 (commit)
via cffbdedd90059681ec922ecc2e401e9b394cd70b (commit)
via 665876529c03f497b3bbccd91e79c79a5fbcdbe8 (commit)
via 5653908e25f6ae0d60efcd948116f5e5dc772617 (commit)
via 0e9f1777e65e5a5c7212761113f88ce9c1498a0b (commit)
via dcf9d11913279c9ef6f5fe45f5af72e012e1abae (commit)
via d175ef184f14d78b57fa05adcf219f3d1232c3c5 (commit)
via 2dcdf7c744cab378763beef2bd5a757510f9ac9e (commit)
via 890359c63a5abbaa2d95ddb94a14e160d4c8cd4c (commit)
via d6bc941e597ea89db2e70f3b922eab543efa9abd (commit)
from 2bb195970c1281b8fba39f609d5c6b713f42ddbc (commit)
Summary of changes:
.gitmodules | 9 --
CMakeLists.txt | 7 +-
cmake | 1 -
config/RtpConfigurator.py | 30 +++---
logger | 1 -
slice | 1 -
.../MediaRTPPJMedia}/RtpConfigurationIf.ice | 9 +-
.../MediaRTPPJMedia}/RtpStateReplicationIf.ice | 10 +-
src/CMakeLists.txt | 120 +++++++++----------
src/MediaRTPpjmedia.cpp | 4 +-
src/RTPConfiguration.cpp | 12 +-
src/RTPSession.cpp | 21 ++--
src/RTPSession.h | 4 +-
src/RTPSink.cpp | 2 +-
src/RTPSink.h | 2 +-
src/RTPSource.cpp | 1 +
src/RTPSource.h | 2 +-
src/ReplicationAdapter.h | 6 +-
src/RtpStateReplicator.h | 12 +-
src/RtpStateReplicatorApp.cpp | 15 ++-
src/RtpStateReplicatorListener.cpp | 5 +-
src/SessionAdapter.h | 4 +-
test/CMakeLists.txt | 50 ++++-----
test/TestRTPICE.cpp | 2 +
test/TestRTPpjmedia.cpp | 7 +-
25 files changed, 163 insertions(+), 174 deletions(-)
delete mode 100644 .gitmodules
delete mode 160000 cmake
delete mode 160000 logger
delete mode 160000 slice
rename {local-slice => slice/AsteriskSCF/Configuration/MediaRTPPJMedia}/RtpConfigurationIf.ice (98%)
rename {local-slice => slice/AsteriskSCF/Replication/MediaRTPPJMedia}/RtpStateReplicationIf.ice (94%)
- Log -----------------------------------------------------------------
commit 27e3d57021068a4b988988880d6fa9e055d45e6f
Author: Brent Eagles <beagles at digium.com>
Date: Mon Jun 27 12:55:22 2011 -0230
Fix build errors from merge.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0be6f2c..73b5627 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,19 +1,6 @@
include_directories(${astscf-ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
-<<<<<<< HEAD
-asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-
-asterisk_scf_component_init(media_rtp_pjmedia)
-
-asterisk_scf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpStateReplicationIf.ice)
-asterisk_scf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpConfigurationIf.ice)
-asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia core thread date_time)
-asterisk_scf_component_build_icebox(media_rtp_pjmedia)
-target_link_libraries(media_rtp_pjmedia logging-client)
-target_link_libraries(media_rtp_pjmedia asterisk-scf-api)
-target_link_libraries(media_rtp_pjmedia ice-util-cpp)
-=======
astscf_component_init(media_rtp_pjmedia)
astscf_component_add_files(media_rtp_pjmedia MediaRTPpjmedia.cpp)
astscf_component_add_files(media_rtp_pjmedia RTPSession.cpp)
diff --git a/src/RTPConfiguration.cpp b/src/RTPConfiguration.cpp
index 826cb0f..5e55b68 100644
--- a/src/RTPConfiguration.cpp
+++ b/src/RTPConfiguration.cpp
@@ -24,7 +24,6 @@
#include <boost/thread/shared_mutex.hpp>
using namespace AsteriskSCF::System::Configuration::V1;
-using namespace AsteriskSCF::Media::RTP::V1;
using namespace AsteriskSCF::PJMediaRTP;
using namespace std;
using namespace AsteriskSCF::Configuration::MediaRTPPJMedia::V1;
diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
index 6fcb7e5..2024066 100644
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@ -55,7 +55,7 @@ public:
const PJMediaEnvironmentPtr& env,
const AsteriskSCF::Media::RTP::V1::RTPServiceLocatorParamsPtr& params,
const AsteriskSCF::System::Component::V1::ReplicaPrx& replicaControl,
- const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Media::RTP::V1::RtpStateReplicatorPrx>&,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorPrx>&,
const ConfigurationServiceImplPtr&);
RTPSessionImpl(const Ice::ObjectAdapterPtr& adapter,
@@ -64,7 +64,7 @@ public:
Ice::Int port,
const AsteriskSCF::Media::V1::FormatSeq& formats,
bool isIPv6,
- const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Media::RTP::V1::RtpStateReplicatorPrx>&,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorPrx>&,
const ConfigurationServiceImplPtr& configurationServant);
~RTPSessionImpl();
@@ -94,12 +94,12 @@ public:
StreamSourceRTPImplPtr getSourceServant();
StreamSinkRTPImplPtr getSinkServant();
- void replicateState(const AsteriskSCF::Media::RTP::V1::RtpSessionStateItemPtr&,
- const AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr&,
- const AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr&);
- void removeState(const AsteriskSCF::Media::RTP::V1::RtpSessionStateItemPtr&,
- const AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr&,
- const AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr&);
+ void replicateState(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpSessionStateItemPtr&,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr&,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr&);
+ void removeState(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpSessionStateItemPtr&,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr&,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr&);
void associatePayloadsImpl(const AsteriskSCF::Media::RTP::V1::PayloadMap& payloadMap);
@@ -207,12 +207,12 @@ public:
{
}
- void replicateState(const AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr& sinkStateItem)
+ void replicateState(const RtpStreamSinkStateItemPtr& sinkStateItem)
{
mServant->replicateState(0, sinkStateItem, 0);
}
- void replicateState(const AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr& sourceStateItem)
+ void replicateState(const RtpStreamSourceStateItemPtr& sourceStateItem)
{
mServant->replicateState(0, 0, sourceStateItem);
}
diff --git a/src/RTPSession.h b/src/RTPSession.h
index f2ae01c..b6f6d54 100644
--- a/src/RTPSession.h
+++ b/src/RTPSession.h
@@ -32,13 +32,13 @@ public:
const PJMediaEnvironmentPtr& environment,
const AsteriskSCF::System::Component::V1::ReplicaPrx& replicaControl,
const AsteriskSCF::Discovery::SmartProxy<
- AsteriskSCF::Media::RTP::V1::RtpStateReplicatorPrx>& stateReplicator,
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorPrx>& stateReplicator,
const ConfigurationServiceImplPtr& configuration
);
static ReplicationAdapterPtr create(const Ice::ObjectAdapterPtr& objectAdapter,
const PJMediaEnvironmentPtr& environment,
- const AsteriskSCF::Media::RTP::V1::RtpSessionStateItemPtr& update,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpSessionStateItemPtr& update,
const ConfigurationServiceImplPtr& configuration
);
};
diff --git a/src/ReplicationAdapter.h b/src/ReplicationAdapter.h
index 32d341d..af5e829 100644
--- a/src/ReplicationAdapter.h
+++ b/src/ReplicationAdapter.h
@@ -32,9 +32,9 @@ class ReplicationAdapter
public:
virtual ~ReplicationAdapter() {}
- virtual void update(const AsteriskSCF::Media::RTP::V1::RtpSessionStateItemPtr& item) = 0;
- virtual void update(const AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr& item) = 0;
- virtual void update(const AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr& item) = 0;
+ virtual void update(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpSessionStateItemPtr& item) = 0;
+ virtual void update(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr& item) = 0;
+ virtual void update(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr& item) = 0;
virtual void destroy() = 0;
};
diff --git a/src/RtpStateReplicator.h b/src/RtpStateReplicator.h
index c2aabfc..d193fd9 100644
--- a/src/RtpStateReplicator.h
+++ b/src/RtpStateReplicator.h
@@ -40,13 +40,8 @@ struct RtpStateReplicatorListenerImpl;
class RtpStateReplicatorListenerI : public AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorListener
{
public:
-<<<<<<< HEAD
RtpStateReplicatorListenerI(const Ice::ObjectAdapterPtr&, const AsteriskSCF::PJMediaRTP::PJMediaEnvironmentPtr&,
- const AsteriskSCF::Media::RTP::V1::RtpGeneralStateItemPtr&,
-=======
- RtpStateReplicatorListenerI(const Ice::ObjectAdapterPtr&, pj_pool_factory*,
const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpGeneralStateItemPtr&,
->>>>>>> cffbdedd90059681ec922ecc2e401e9b394cd70b
const ConfigurationServiceImplPtr&);
~RtpStateReplicatorListenerI();
void stateRemoved(const Ice::StringSeq&, const Ice::Current&);
diff --git a/src/SessionAdapter.h b/src/SessionAdapter.h
index 48834e2..0c550d1 100644
--- a/src/SessionAdapter.h
+++ b/src/SessionAdapter.h
@@ -45,8 +45,8 @@ class SessionAdapter
public:
virtual ~SessionAdapter() {}
- virtual void replicateState(const AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr& sinkStateItem) = 0;
- virtual void replicateState(const AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr& sourceStateItem) = 0;
+ virtual void replicateState(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr& sinkStateItem) = 0;
+ virtual void replicateState(const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr& sourceStateItem) = 0;
virtual AsteriskSCF::Media::V1::FormatPtr getFormat(int payload) = 0;
virtual int getPayload(const AsteriskSCF::Media::V1::FormatPtr& format) = 0;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d430416..192af9b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${ice-util-cpp_dir}/include)
+include_directories(${astscf-ice-util-cpp_dir}/include)
astscf_component_init(media_rtp_pjmedia_test)
astscf_component_add_files(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
astscf_component_add_slices(media_rtp_pjmedia_test PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
@@ -18,16 +18,12 @@ set_property(TARGET media_rtp_pjmedia_test_v6 PROPERTY COMPILE_DEFINITIONS IPV6_
astscf_component_init(media_rtp_pjmedia_ice_test)
astscf_component_add_files(media_rtp_pjmedia_ice_test TestRTPICE.cpp)
astscf_component_add_slices(media_rtp_pjmedia_ice_test PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
-astscf_component_add_slices(media_rtp_pjmedia_ice_test PROJECT AsteriskSCF/System/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice)
+astscf_component_add_slices(media_rtp_pjmedia_ice_test PROJECT AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice)
astscf_component_add_boost_libraries(media_rtp_pjmedia_ice_test unit_test_framework thread date_time)
astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_ice_test ASTSCF)
astscf_component_build_icebox(media_rtp_pjmedia_ice_test)
pjproject_link(media_rtp_pjmedia_ice_test pjlib)
-asterisk_scf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
-asterisk_scf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.config)
-asterisk_scf_test_icebox(media_rtp_pjmedia_ice_test config/test_rtp_ice.config)
-
astscf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
astscf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.config)
astscf_test_icebox(media_rtp_pjmedia_ice_test config/test_rtp_ice.config)
diff --git a/test/TestRTPICE.cpp b/test/TestRTPICE.cpp
index 057b7eb..77393a9 100644
--- a/test/TestRTPICE.cpp
+++ b/test/TestRTPICE.cpp
@@ -46,6 +46,8 @@ using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::Media::V1;
using namespace AsteriskSCF::Media::RTP::V1;
using namespace AsteriskSCF::System::Configuration::V1;
+using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
+using namespace AsteriskSCF::Configuration::MediaRTPPJMedia::V1;
namespace
{
commit 4072e2883499920c2343700761799fafccce6873
Merge: 2bb1959 cffbded
Author: Brent Eagles <beagles at digium.com>
Date: Mon Jun 27 11:26:29 2011 -0230
Merge master into modular-transport-refactor
diff --cc src/CMakeLists.txt
index b8613b7,3909e11..0be6f2c
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,55 -1,24 +1,64 @@@
- include_directories(${API_INCLUDE_DIR})
- include_directories(${ice-util-cpp_dir}/include)
+ include_directories(${astscf-ice-util-cpp_dir}/include)
include_directories(${logger_dir}/include)
++<<<<<<< HEAD
+asterisk_scf_slice_include_directories(${API_SLICE_DIR})
+
+asterisk_scf_component_init(media_rtp_pjmedia)
- asterisk_scf_component_add_file(media_rtp_pjmedia MediaRTPpjmedia.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia RTPSession.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia RTPSource.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia RTPSink.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia RTPSession.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia RTPSource.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia RTPSink.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia RtpStateReplicatorListener.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia RtpStateReplicator.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia RTPConfiguration.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia RTPConfiguration.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia PJLibConfiguration.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia PJLibConfiguration.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia PJMediaEnvironment.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia PJMediaEnvironment.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia PJMediaTransport.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia PJMediaTransport.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia PJMediaEndpoint.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia PJMediaEndpoint.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia UDPTransport.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia UDPTransport.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia PJUtil.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia ReplicationAdapter.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia SessionAdapter.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia Configuration.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia NATConfig.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia NATConfig.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia NATModule.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia NATModule.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia ICEConfiguration.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia ICEConfiguration.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia ICETransport.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia ICETransport.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia SRTPConfiguration.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia SRTPConfiguration.h)
- asterisk_scf_component_add_file(media_rtp_pjmedia SRTPTransport.cpp)
- asterisk_scf_component_add_file(media_rtp_pjmedia SRTPTransport.h)
+
+asterisk_scf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpStateReplicationIf.ice)
+asterisk_scf_component_add_slice(media_rtp_pjmedia ../local-slice/RtpConfigurationIf.ice)
+asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia core thread date_time)
+asterisk_scf_component_build_icebox(media_rtp_pjmedia)
+target_link_libraries(media_rtp_pjmedia logging-client)
+target_link_libraries(media_rtp_pjmedia asterisk-scf-api)
+target_link_libraries(media_rtp_pjmedia ice-util-cpp)
++=======
+ astscf_component_init(media_rtp_pjmedia)
+ astscf_component_add_files(media_rtp_pjmedia MediaRTPpjmedia.cpp)
+ astscf_component_add_files(media_rtp_pjmedia RTPSession.cpp)
+ astscf_component_add_files(media_rtp_pjmedia RTPSource.cpp)
+ astscf_component_add_files(media_rtp_pjmedia RTPSink.cpp)
+ astscf_component_add_files(media_rtp_pjmedia RTPSession.h)
+ astscf_component_add_files(media_rtp_pjmedia RTPSource.h)
+ astscf_component_add_files(media_rtp_pjmedia RTPSink.h)
+ astscf_component_add_files(media_rtp_pjmedia RtpStateReplicatorListener.cpp)
+ astscf_component_add_files(media_rtp_pjmedia RtpStateReplicator.h)
+ astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.cpp)
+ astscf_component_add_files(media_rtp_pjmedia RTPConfiguration.h)
++astscf_component_add_files(media_rtp_pjmedia PJLibConfiguration.cpp)
++astscf_component_add_files(media_rtp_pjmedia PJLibConfiguration.h)
++astscf_component_add_files(media_rtp_pjmedia PJMediaEnvironment.cpp)
++astscf_component_add_files(media_rtp_pjmedia PJMediaEnvironment.h)
++astscf_component_add_files(media_rtp_pjmedia PJMediaTransport.cpp)
++astscf_component_add_files(media_rtp_pjmedia PJMediaTransport.h)
++astscf_component_add_files(media_rtp_pjmedia PJMediaEndpoint.cpp)
++astscf_component_add_files(media_rtp_pjmedia PJMediaEndpoint.h)
++astscf_component_add_files(media_rtp_pjmedia UDPTransport.cpp)
++astscf_component_add_files(media_rtp_pjmedia UDPTransport.h)
++astscf_component_add_files(media_rtp_pjmedia PJUtil.h)
++astscf_component_add_files(media_rtp_pjmedia ReplicationAdapter.h)
++astscf_component_add_files(media_rtp_pjmedia SessionAdapter.h)
++astscf_component_add_files(media_rtp_pjmedia Configuration.h)
++astscf_component_add_files(media_rtp_pjmedia NATConfig.cpp)
++astscf_component_add_files(media_rtp_pjmedia NATConfig.h)
++astscf_component_add_files(media_rtp_pjmedia NATModule.cpp)
++astscf_component_add_files(media_rtp_pjmedia NATModule.h)
++astscf_component_add_files(media_rtp_pjmedia ICEConfiguration.cpp)
++astscf_component_add_files(media_rtp_pjmedia ICEConfiguration.h)
++astscf_component_add_files(media_rtp_pjmedia ICETransport.cpp)
++astscf_component_add_files(media_rtp_pjmedia ICETransport.h)
++astscf_component_add_files(media_rtp_pjmedia SRTPConfiguration.cpp)
++astscf_component_add_files(media_rtp_pjmedia SRTPConfiguration.h)
++astscf_component_add_files(media_rtp_pjmedia SRTPTransport.cpp)
++astscf_component_add_files(media_rtp_pjmedia SRTPTransport.h)
+ astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
+ astscf_component_add_slices(media_rtp_pjmedia PROJECT AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice)
+ astscf_component_add_boost_libraries(media_rtp_pjmedia core thread)
+ astscf_component_add_slice_collection_libraries(media_rtp_pjmedia ASTSCF)
+ astscf_component_build_icebox(media_rtp_pjmedia)
+ target_link_libraries(media_rtp_pjmedia logging-client)
++
pjproject_link(media_rtp_pjmedia pjlib)
pjproject_link(media_rtp_pjmedia pjlib-util)
pjproject_link(media_rtp_pjmedia pjmedia)
diff --cc src/RTPConfiguration.cpp
index b95780b,5e8ee26..826cb0f
--- a/src/RTPConfiguration.cpp
+++ b/src/RTPConfiguration.cpp
@@@ -14,114 -14,23 +14,115 @@@
* at the top of the source tree.
*/
+#include "RtpConfigurationIf.h"
+#include "RTPConfiguration.h"
+
#include <IceUtil/UUID.h>
+#include <AsteriskSCF/System/Component/ConfigurationIf.h>
#include <boost/thread.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/thread/shared_mutex.hpp>
-#include <AsteriskSCF/System/Component/ConfigurationIf.h>
-
-#include "RtpConfigurationIf.h"
-#include "RTPConfiguration.h"
-
using namespace AsteriskSCF::System::Configuration::V1;
+using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::PJMediaRTP;
+using namespace std;
+ using namespace AsteriskSCF::Configuration::MediaRTPPJMedia::V1;
-class ConfigurationServiceImplPriv
+/**
+ * Implementation of the configuration service.
+ */
+class ConfigurationServiceServant : virtual public ConfigurationServiceImpl
{
public:
+
+ /**
+ * AsteriskSCF::System::Configuration::V1 interface. Slice to C++ mapping.
+ */
+ AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq
+ getConfiguration(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
+
+ AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq
+ getConfigurationAll(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
+
+ AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq
+ getConfigurationGroups(const Ice::Current&);
+
+ void setConfiguration(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&, const Ice::Current&);
+
+ void removeConfigurationItems(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
+ const Ice::Current&);
+ void removeConfigurationGroups(const AsteriskSCF::System::Configuration::V1::ConfigurationGroupSeq&,
+ const Ice::Current&);
+
+ /**
+ * AsteriskSCF::PJMediaRTP::RTPConfiguration interface.
+ */
+ int getStartPort();
+ int getEndPort();
+ int getWorkerThreadCount();
+
+ std::string getBindIPv4Address();
+ std::string getBindIPv6Address();
+
+ PJLibConfigurationPtr libConfig() const
+ {
+ return PJLibConfigurationPtr(); // XXX this isn't implemented here at this time.
+ }
+
+ NATConfigPtr natConfig() const
+ {
+ return mNATConfig;
+ }
+
+ ICEConfigurationPtr ICEConfig() const
+ {
+ return mICEConfig;
+ }
+
+ SRTPConfigurationPtr srtpConfig() const
+ {
+ return mSRTPConfig;
+ }
+
+ ConfigurationServicePrx activate(const Ice::ObjectAdapterPtr& objectAdapter, const string& id);
+
+ void replaceConfig(const ICEConfigurationPtr& newConfig)
+ {
+ mICEConfig = newConfig;
+ }
+
+ void replaceConfig(const NATConfigPtr& newConfig)
+ {
+ mNATConfig = newConfig;
+ }
+
+ void replaceConfig(const SRTPConfigurationPtr& newConfig)
+ {
+ mSRTPConfig = newConfig;
+ }
+
+ RtpGeneralGroupPtr getGeneralGroup()
+ {
+ return mGeneralGroup;
+ }
+
+ RTPICEConfigurationGroupPtr getICEConfigurationGroup()
+ {
+ return mICEConfiguration;
+ }
+
+ void replaceGroup(const RtpGeneralGroupPtr& group)
+ {
+ mGeneralGroup = group;
+ }
+
+ void replaceGroup(const RTPICEConfigurationGroupPtr& group)
+ {
+ mICEConfiguration = group;
+ }
+
+private:
/**
* General RTP configuration
*/
@@@ -176,10 -77,9 +177,10 @@@ ConfigurationGroupSeq ConfigurationServ
}
}
- void visitRtpGeneralGroup(const ::AsteriskSCF::Media::RTP::V1::RtpGeneralGroupPtr& group)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr& group)
{
- if (!mImplPriv->mGeneralGroup)
+ RtpGeneralGroupPtr currentGroup = mImpl->getGeneralGroup();
+ if (currentGroup)
{
return;
}
@@@ -227,31 -111,21 +228,31 @@@ ConfigurationGroupSeq ConfigurationServ
class GroupVisitor : public RtpConfigurationGroupVisitor
{
public:
- GroupVisitor(boost::shared_ptr<ConfigurationServiceImplPriv> implPriv, ConfigurationGroupSeq& visitorGroups) :
- mImplPriv(implPriv), mGroups(visitorGroups) { };
+ GroupVisitor(const ConfigurationServiceServantPtr& impl, ConfigurationGroupSeq& visitorGroups) :
+ mImpl(impl), mGroups(visitorGroups)
+ {
+ }
private:
- void visitRtpGeneralGroup(const RtpGeneralGroupPtr&)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr&)
{
- if (!mImplPriv->mGeneralGroup)
+ RtpGeneralGroupPtr g = mImpl->getGeneralGroup();
+ if (g)
{
- return;
+ mGroups.push_back(g);
}
-
- mGroups.push_back(mImplPriv->mGeneralGroup);
};
+
+ void visitICEConfigurationGroup(const RTPICEConfigurationGroupPtr&)
+ {
+ RTPICEConfigurationGroupPtr g = mImpl->getICEConfigurationGroup();
+ if (g)
+ {
+ mGroups.push_back(g);
+ }
+ }
- boost::shared_ptr<ConfigurationServiceImplPriv> mImplPriv;
+ ConfigurationServiceServantPtr mImpl;
ConfigurationGroupSeq& mGroups;
};
@@@ -328,12 -196,11 +329,12 @@@ void ConfigurationServiceServant::setCo
}
}
- void visitRtpGeneralGroup(const ::AsteriskSCF::Media::RTP::V1::RtpGeneralGroupPtr& group)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr& group)
{
- if (!mImplPriv->mGeneralGroup)
+ RtpGeneralGroupPtr g = mImpl->getGeneralGroup();
+ if (!g)
{
- mImplPriv->mGeneralGroup = new RtpGeneralGroup();
+ g = new RtpGeneralGroup();
}
else
{
@@@ -508,129 -256,23 +509,129 @@@ void ConfigurationServiceServant::remov
}
}
- void visitRtpGeneralGroup(const ::AsteriskSCF::Media::RTP::V1::RtpGeneralGroupPtr& group)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr& group)
{
- if (!mImplPriv->mGeneralGroup)
+ RtpGeneralGroupPtr g = mImpl->getGeneralGroup();
+ if (g)
{
- return;
+ removeItems(0, group->configurationItems, g->configurationItems);
}
+ }
+
+ void visitRTPICEConfigurationGroup(const RTPICEConfigurationGroupPtr& group)
+ {
+ //
+ // The Visitor in this case interprets the provided information
+ // to decide what it needs to do. This type of thing might be better moved
+ // into a separate helper class (along with the set operations), but
+ // we'll leave it here for now to avoid inconsistencies with the
+ // rest of the configuration implementation.
+ //
+ class Visitor : public RtpConfigurationItemVisitor
+ {
+ public:
+ Visitor(const ConfigurationServiceServantPtr& impl) :
+ mImpl(impl),
+ mRemoveSTUNServer(false),
+ mRemoveTURNServer(false),
+ mDisable(false),
+ mResetICEConfig(false)
+ {
+ }
+
+ ~Visitor()
+ {
+ if (mDisable)
+ {
+ }
+
+ NATConfigPtr natCfg = mImpl->natConfig();
+
+ if (natCfg)
+ {
+ if (!mRemoveSTUNServer)
+ {
+ stunServer = natCfg->stunServer();
+ }
+ if (!mRemoveTURNServer)
+ {
+ turnServer = natCfg->turnServer();
+ }
+ NATConfigPtr newConfig;
+ if (mDisable)
+ {
+ newConfig = NATConfig::create(stunServer, false, turnServer, false);
+ }
+ else
+ {
+ newConfig = NATConfig::create(stunServer, natCfg->isSTUNEnabled(), turnServer,
+ natCfg->isTURNEnabled());
+ }
+ mImpl->replaceConfig(newConfig);
+ }
+ if (mResetICEConfig)
+ {
+ mImpl->replaceConfig(ICEConfigurationPtr());
+ }
+ }
+
+ void visitSTUNServerItem(const STUNServerItemPtr& item)
+ {
+ if (item)
+ {
+ mRemoveSTUNServer = true;
+ }
+ }
+
+ void visitTURNServerItem(const TURNServerItemPtr& item)
+ {
+ if (item)
+ {
+ mRemoveTURNServer = true;
+ }
+ }
+
+ void visitRTPICETransportFlagsItem(const RTPICETransportFlagsItemPtr& item)
+ {
+ if (item)
+ {
+ mDisable = true;
+ }
+ }
+
+ void visitRTPICETransportLimitsItem(const RTPICETransportLimitsItemPtr& item)
+ {
+ if (item)
+ {
+ mResetICEConfig = true;
+ }
+ }
+
+ private:
+ ConfigurationServiceServantPtr mImpl;
+ bool mRemoveSTUNServer;
+ bool mRemoveTURNServer;
+ bool mDisable;
+ bool mResetICEConfig;
+ AsteriskSCF::Helpers::AddressPtr stunServer;
+ AsteriskSCF::Helpers::AddressPtr turnServer;
+ };
+
+ RTPICEConfigurationGroupPtr g = mImpl->getICEConfigurationGroup();
- removeItems(0, group->configurationItems, mImplPriv->mGeneralGroup->configurationItems);
- };
+ if (g)
+ {
+ RtpConfigurationItemVisitorPtr v(new Visitor(mImpl));
+ removeItems(v, group->configurationItems, g->configurationItems);
+ }
+ }
private:
- boost::shared_ptr<ConfigurationServiceImplPriv> mImplPriv;
+ ConfigurationServiceServantPtr mImpl;
};
- RtpConfigurationGroupVisitorPtr v = new GroupVisitor(mImplPriv);
-
- boost::unique_lock<boost::shared_mutex> lock(mImplPriv->mLock);
+ RtpConfigurationGroupVisitorPtr v = new GroupVisitor(this);
+ boost::unique_lock<boost::shared_mutex> lock(mLock);
for (ConfigurationGroupSeq::const_iterator group = groups.begin(); group != groups.end(); ++group)
{
@@@ -643,28 -285,25 +644,28 @@@ void ConfigurationServiceServant::remov
class GroupVisitor : public RtpConfigurationGroupVisitor
{
public:
- GroupVisitor(boost::shared_ptr<ConfigurationServiceImplPriv> implPriv) : mImplPriv(implPriv) { };
+ GroupVisitor(const ConfigurationServiceServantPtr& impl) :
+ mImpl(impl)
+ {
+ }
private:
- void visitRtpGeneralGroup(const ::AsteriskSCF::Media::RTP::V1::RtpGeneralGroupPtr&)
+ void visitRtpGeneralGroup(const ::AsteriskSCF::Configuration::MediaRTPPJMedia::V1::RtpGeneralGroupPtr&)
{
- if (!mImplPriv->mGeneralGroup)
- {
- return;
- }
-
- mImplPriv->mGeneralGroup = 0;
- };
-
- boost::shared_ptr<ConfigurationServiceImplPriv> mImplPriv;
+ mImpl->replaceGroup(RtpGeneralGroupPtr());
+ }
+
+ void visitICEConfigurationGroup(const RTPICEConfigurationGroupPtr&)
+ {
+ mImpl->replaceGroup(RTPICEConfigurationGroupPtr());
+ }
+
+ ConfigurationServiceServantPtr mImpl;
};
- RtpConfigurationGroupVisitorPtr v = new GroupVisitor(mImplPriv);
+ RtpConfigurationGroupVisitorPtr v = new GroupVisitor(this);
- boost::unique_lock<boost::shared_mutex> lock(mImplPriv->mLock);
+ boost::unique_lock<boost::shared_mutex> lock(mLock);
for (ConfigurationGroupSeq::const_iterator group = groups.begin(); group != groups.end(); ++group)
{
diff --cc src/RTPSession.cpp
index 5bc5d48,05ce690..6fcb7e5
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@@ -39,87 -36,48 +39,88 @@@ using namespace std
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::Media::V1;
using namespace AsteriskSCF::Media::RTP::V1;
+ using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
using namespace AsteriskSCF::System::Component::V1;
using namespace AsteriskSCF::Discovery;
+using namespace AsteriskSCF::PJMediaRTP;
/**
- * Default value for where we should start allocating RTP and RTCP ports from.
- */
-#define DEFAULT_RTP_PORT_MINIMUM 10000
-
-/**
- * Default value for where we should stop allocating RTP and RTCP ports.
+ * Implementation of the RTPSession interface as defined in MediaRTPIf.ice
*/
-#define DEFAULT_RTP_PORT_MAXIMUM 20000
-
-/**
- * Private implementation details for the RTPSessionImpl class.
- */
-class RTPSessionImplPriv
+class RTPSessionImpl : public AsteriskSCF::Media::RTP::V1::RTPSession
{
public:
- RTPSessionImplPriv(const Ice::ObjectAdapterPtr& adapter, const FormatSeq& formats,
- const ReplicaPtr& replicaService,
- const AsteriskSCF::Discovery::SmartProxy<RtpStateReplicatorPrx>& stateReplicator) :
- mAdapter(adapter), mFormats(formats),
- mSessionStateItem(new RtpSessionStateItem()),
- mReplicaService(replicaService), mStateReplicator(stateReplicator) { };
- ~RTPSessionImplPriv();
+ RTPSessionImpl(const Ice::ObjectAdapterPtr&,
+ const string& id,
+ const PJMediaEnvironmentPtr& env,
+ const AsteriskSCF::Media::RTP::V1::RTPServiceLocatorParamsPtr& params,
+ const AsteriskSCF::System::Component::V1::ReplicaPrx& replicaControl,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Media::RTP::V1::RtpStateReplicatorPrx>&,
+ const ConfigurationServiceImplPtr&);
+
+ RTPSessionImpl(const Ice::ObjectAdapterPtr& adapter,
+ const string& sessionIdentity,
+ const PJMediaEnvironmentPtr& env,
+ Ice::Int port,
+ const AsteriskSCF::Media::V1::FormatSeq& formats,
+ bool isIPv6,
+ const AsteriskSCF::Discovery::SmartProxy<AsteriskSCF::Media::RTP::V1::RtpStateReplicatorPrx>&,
+ const ConfigurationServiceImplPtr& configurationServant);
+
+ ~RTPSessionImpl();
/**
- * A pointer to the object adapter that objects should be added to.
+ * AsteriskSCF::Media::V1::Session implementation.
*/
- Ice::ObjectAdapterPtr mAdapter;
+ 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&);
+ AsteriskSCF::Media::RTP::V1::RTCPSessionPrx getRTCPSession(const Ice::Current&);
+ void release(const Ice::Current&);
+ void associatePayloads(const AsteriskSCF::Media::RTP::V1::PayloadMap&, const Ice::Current&);
/**
- * A sequence of formats that the session is expected to carry.
+ * Internal methods.
*/
- FormatSeq mFormats;
+ AsteriskSCF::Media::V1::FormatSeq getFormats();
+ void setRemoteDetails(const std::string& address, Ice::Int port);
+ AsteriskSCF::Media::V1::FormatPtr getFormat(int payload);
+ int getPayload(const AsteriskSCF::Media::V1::FormatPtr& mediaformat);
/**
- * A proxy to ourselves.
+ * Accessors for the source and sink servants.
*/
- RTPSessionPrx mProxy;
+ StreamSourceRTPImplPtr getSourceServant();
+ StreamSinkRTPImplPtr getSinkServant();
+
+ void replicateState(const AsteriskSCF::Media::RTP::V1::RtpSessionStateItemPtr&,
+ const AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr&,
+ const AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr&);
+ void removeState(const AsteriskSCF::Media::RTP::V1::RtpSessionStateItemPtr&,
+ const AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr&,
+ const AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr&);
+
+ void associatePayloadsImpl(const AsteriskSCF::Media::RTP::V1::PayloadMap& payloadMap);
+
+ RTPSessionPrx activate(const string& id);
+ RTPSessionPrx activate(const Ice::Identity& id, const Ice::Identity& sourceId, const Ice::Identity& sinkId);
+
+ void destroy();
+
+private:
+
+ boost::shared_mutex mLock;
+
+ /**
+ * Instance of the session adapter to be passed to sinks, sources, configuration, etc.
+ */
+ SessionAdapterPtr mSessionAdapter;
+
+ /**
+ * The current pjmedia related environment.
+ */
+ PJMediaEnvironmentPtr mEnvironment;
/**
* pjmedia endpoint for our media.
diff --cc src/RTPSink.cpp
index 929e129,2cf4741..d1cd962
--- a/src/RTPSink.cpp
+++ b/src/RTPSink.cpp
@@@ -31,8 -33,7 +31,8 @@@ using namespace std
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::Media::V1;
using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::PJMediaRTP;
-
+ using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
/**
* Private implementation details for the StreamSinkRTPImpl class.
diff --cc src/RTPSink.h
index e59a546,3739362..2036a14
--- a/src/RTPSink.h
+++ b/src/RTPSink.h
@@@ -39,14 -30,7 +39,14 @@@ public
void setRemoteDetails(const std::string&, Ice::Int, const Ice::Current&);
std::string getRemoteAddress(const Ice::Current&);
Ice::Int getRemotePort(const Ice::Current&);
+
+ /**
+ * Internal implementation methods.
+ */
- AsteriskSCF::Media::RTP::V1::RtpStreamSinkStateItemPtr getStateItem();
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSinkStateItemPtr getStateItem();
+ void setRemoteDetailsImpl(const std::string& host, Ice::Int port);
+ void setSourceImpl(const AsteriskSCF::Media::V1::StreamSourcePrx& proxy);
+
private:
/**
* Private implementation data for StreamSinkRTPImpl.
diff --cc src/RTPSource.cpp
index 1d855ac,909bbc5..639062a
--- a/src/RTPSource.cpp
+++ b/src/RTPSource.cpp
@@@ -31,8 -33,8 +31,9 @@@ using namespace std
using namespace AsteriskSCF::Core::Discovery::V1;
using namespace AsteriskSCF::Media::V1;
using namespace AsteriskSCF::Media::RTP::V1;
+ using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
using namespace AsteriskSCF::System::Logging;
+using namespace AsteriskSCF::PJMediaRTP;
namespace
{
diff --cc src/RTPSource.h
index 1d9ee23,9da0b2a..093eb6b
--- a/src/RTPSource.h
+++ b/src/RTPSource.h
@@@ -36,10 -30,8 +36,10 @@@ public
std::string getLocalAddress(const Ice::Current&);
Ice::Int getLocalPort(const Ice::Current&);
void setRemoteDetails(const std::string& address, Ice::Int port);
- AsteriskSCF::Media::RTP::V1::RtpStreamSourceStateItemPtr getStateItem();
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStreamSourceStateItemPtr getStateItem();
+ void setSinkImpl(const AsteriskSCF::Media::V1::StreamSinkPrx& proxy);
+
/**
* Private implementation data for StreamSourceRTPImpl.
* Note: This is public on purpose so that our RTP callback can access it.
diff --cc src/RtpStateReplicator.h
index 3bb1b4b,7d71e26..c2aabfc
--- a/src/RtpStateReplicator.h
+++ b/src/RtpStateReplicator.h
@@@ -16,19 -16,21 +16,19 @@@
#pragma once
-#include <Ice/Ice.h>
-
-#include <AsteriskSCF/Replication/StateReplicator.h>
#include "RtpStateReplicationIf.h"
#include "RTPConfiguration.h"
+#include "PJMediaEnvironment.h"
+#include <Ice/Ice.h>
+#include <AsteriskSCF/Replication/StateReplicator.h>
#include <boost/shared_ptr.hpp>
-#include "RTPConfiguration.h"
-
typedef AsteriskSCF::Replication::StateReplicator<
- AsteriskSCF::Media::RTP::V1::RtpStateReplicator,
- AsteriskSCF::Media::RTP::V1::RtpStateItemPtr,
- std::string, AsteriskSCF::Media::RTP::V1::RtpStateReplicatorListenerPrx> RtpStateReplicatorI;
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicator,
+ AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateItemPtr,
+ std::string, AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorListenerPrx> RtpStateReplicatorI;
typedef IceUtil::Handle<RtpStateReplicatorI> RtpStateReplicatorIPtr;
@@@ -37,11 -39,11 +37,16 @@@
//
struct RtpStateReplicatorListenerImpl;
- class RtpStateReplicatorListenerI : public AsteriskSCF::Media::RTP::V1::RtpStateReplicatorListener
+ class RtpStateReplicatorListenerI : public AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateReplicatorListener
{
public:
++<<<<<<< HEAD
+ RtpStateReplicatorListenerI(const Ice::ObjectAdapterPtr&, const AsteriskSCF::PJMediaRTP::PJMediaEnvironmentPtr&,
+ const AsteriskSCF::Media::RTP::V1::RtpGeneralStateItemPtr&,
++=======
+ RtpStateReplicatorListenerI(const Ice::ObjectAdapterPtr&, pj_pool_factory*,
+ const AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpGeneralStateItemPtr&,
++>>>>>>> cffbdedd90059681ec922ecc2e401e9b394cd70b
const ConfigurationServiceImplPtr&);
~RtpStateReplicatorListenerI();
void stateRemoved(const Ice::StringSeq&, const Ice::Current&);
diff --cc src/RtpStateReplicatorListener.cpp
index 73853c2,e3af713..4e1ab03
--- a/src/RtpStateReplicatorListener.cpp
+++ b/src/RtpStateReplicatorListener.cpp
@@@ -29,7 -28,9 +29,8 @@@
using namespace std;
using namespace AsteriskSCF::Media::RTP::V1;
+using namespace AsteriskSCF::PJMediaRTP;
+ using namespace AsteriskSCF::Replication::MediaRTPPJMedia::V1;
class RtpStateReplicatorItem
{
@@@ -75,10 -69,9 +76,10 @@@ public
mStateItems.erase((*key));
}
}
+
void setStateNoticeImpl(const RtpStateItemSeq& items)
{
- class visitor : public AsteriskSCF::Media::RTP::V1::RtpStateItemVisitor
+ class visitor : public AsteriskSCF::Replication::MediaRTPPJMedia::V1::RtpStateItemVisitor
{
public:
visitor(RtpStateReplicatorListenerImpl *impl) : mImpl(impl)
diff --cc test/CMakeLists.txt
index 4bc6fe8,af97c3f..d430416
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@@ -1,33 -1,18 +1,33 @@@
- include_directories(${API_INCLUDE_DIR})
+include_directories(${ice-util-cpp_dir}/include)
+ astscf_component_init(media_rtp_pjmedia_test)
+ astscf_component_add_files(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
+ astscf_component_add_slices(media_rtp_pjmedia_test PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
+ astscf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread date_time)
+ astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_test ASTSCF)
+ astscf_component_build_icebox(media_rtp_pjmedia_test)
- asterisk_scf_slice_include_directories(${API_SLICE_DIR})
-
- asterisk_scf_component_init(media_rtp_pjmedia_test)
- asterisk_scf_component_add_file(media_rtp_pjmedia_test TestRTPpjmedia.cpp)
- asterisk_scf_component_add_slice(media_rtp_pjmedia_test ../local-slice/RtpStateReplicationIf.ice)
- asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia_test unit_test_framework thread date_time)
- asterisk_scf_component_build_icebox(media_rtp_pjmedia_test)
- target_link_libraries(media_rtp_pjmedia_test asterisk-scf-api)
-
- asterisk_scf_component_init(media_rtp_pjmedia_test_v6)
- asterisk_scf_component_add_file(media_rtp_pjmedia_test_v6 TestRTPpjmedia.cpp)
- asterisk_scf_component_add_slice(media_rtp_pjmedia_test_v6 ../local-slice/RtpStateReplicationIf.ice)
- asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia_test_v6 unit_test_framework thread date_time)
- asterisk_scf_component_build_icebox(media_rtp_pjmedia_test_v6)
+ astscf_component_init(media_rtp_pjmedia_test_v6)
+ astscf_component_add_files(media_rtp_pjmedia_test_v6 TestRTPpjmedia.cpp)
+ astscf_component_add_slices(media_rtp_pjmedia_test_v6 PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
+ astscf_component_add_boost_libraries(media_rtp_pjmedia_test_v6 unit_test_framework thread date_time)
+ astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_test_v6 ASTSCF)
+ astscf_component_build_icebox(media_rtp_pjmedia_test_v6)
pjproject_link(media_rtp_pjmedia_test_v6 pjlib)
set_property(TARGET media_rtp_pjmedia_test_v6 PROPERTY COMPILE_DEFINITIONS IPV6_TEST)
- target_link_libraries(media_rtp_pjmedia_test_v6 asterisk-scf-api)
- asterisk_scf_component_init(media_rtp_pjmedia_ice_test)
- asterisk_scf_component_add_file(media_rtp_pjmedia_ice_test TestRTPICE.cpp)
- asterisk_scf_component_add_slice(media_rtp_pjmedia_ice_test ../local-slice/RtpStateReplicationIf.ice)
- asterisk_scf_component_add_slice(media_rtp_pjmedia_ice_test ../local-slice/RtpConfigurationIf.ice)
- asterisk_scf_component_add_boost_libraries(media_rtp_pjmedia_ice_test unit_test_framework thread date_time)
- asterisk_scf_component_build_icebox(media_rtp_pjmedia_ice_test)
++astscf_component_init(media_rtp_pjmedia_ice_test)
++astscf_component_add_files(media_rtp_pjmedia_ice_test TestRTPICE.cpp)
++astscf_component_add_slices(media_rtp_pjmedia_ice_test PROJECT AsteriskSCF/Replication/MediaRTPPJMedia/RtpStateReplicationIf.ice)
++astscf_component_add_slices(media_rtp_pjmedia_ice_test PROJECT AsteriskSCF/System/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice)
++astscf_component_add_boost_libraries(media_rtp_pjmedia_ice_test unit_test_framework thread date_time)
++astscf_component_add_slice_collection_libraries(media_rtp_pjmedia_ice_test ASTSCF)
++astscf_component_build_icebox(media_rtp_pjmedia_ice_test)
+pjproject_link(media_rtp_pjmedia_ice_test pjlib)
+
+asterisk_scf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
+asterisk_scf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.config)
+asterisk_scf_test_icebox(media_rtp_pjmedia_ice_test config/test_rtp_ice.config)
+
+ astscf_test_icebox(media_rtp_pjmedia_test config/test_component.config)
+ astscf_test_icebox(media_rtp_pjmedia_test_v6 config/test_component_v6.config)
++astscf_test_icebox(media_rtp_pjmedia_ice_test config/test_rtp_ice.config)
commit cffbdedd90059681ec922ecc2e401e9b394cd70b
Author: Joshua Colp <jcolp at digium.com>
Date: Sat Jun 25 21:29:10 2011 -0300
Bring up to date with build system changes and slice changes.
diff --git a/config/RtpConfigurator.py b/config/RtpConfigurator.py
index 60a1bba..018a1e0 100755
--- a/config/RtpConfigurator.py
+++ b/config/RtpConfigurator.py
@@ -19,32 +19,32 @@
# Rtp configurator
# Bring in the common configuration infrastructure
-import Ice, Configurator, sys
+import Ice, Configurator, sys, os
# Load our component specific configuration definitions
-Ice.loadSlice('-I. -I/opt/Ice-3.4.1/slice -I../../slice --all ../local-slice/RtpConfigurationIf.ice')
-import AsteriskSCF.Media.RTP.V1
+Ice.loadSlice("-I" + os.environ["ASTSCF_HOME"] + " -I" + Ice.getSliceDir() + " --all ../slice/AsteriskSCF/Configuration/MediaRTPPJMedia/RtpConfigurationIf.ice")
+import AsteriskSCF.Configuration.MediaRTPPJMedia.V1
# Add our own visitor implementations for the sections we support
class RtpSectionVisitors(Configurator.SectionVisitors):
def visit_general(self, config, section):
- group = AsteriskSCF.Media.RTP.V1.RtpGeneralGroup()
+ group = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RtpGeneralGroup()
group.configurationItems = { }
mapper = Configurator.OptionMapper()
- portsItem = AsteriskSCF.Media.RTP.V1.PortRangesItem()
- mapper.map('startport', portsItem, 'startPort', AsteriskSCF.Media.RTP.V1.PortRangesItemName, config.getint, 10000)
- mapper.map('endport', portsItem, 'endPort', AsteriskSCF.Media.RTP.V1.PortRangesItemName, config.getint, 20000)
+ portsItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItem()
+ mapper.map('startport', portsItem, 'startPort', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItemName, config.getint, 10000)
+ mapper.map('endport', portsItem, 'endPort', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.PortRangesItemName, config.getint, 20000)
- workerItem = AsteriskSCF.Media.RTP.V1.WorkerThreadCountItem()
- mapper.map('workerthreadcount', workerItem, 'count', AsteriskSCF.Media.RTP.V1.WorkerThreadCountItemName, config.getint, 4)
+ workerItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.WorkerThreadCountItem()
+ mapper.map('workerthreadcount', workerItem, 'count', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.WorkerThreadCountItemName, config.getint, 4)
- ipv4BindingItem = AsteriskSCF.Media.RTP.V1.BindingIPv4Item()
- mapper.map('ipv4bind', ipv4BindingItem, 'address', AsteriskSCF.Media.RTP.V1.BindingIPv4AddressItemName, config.get, None)
+ ipv4BindingItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv4Item()
+ mapper.map('ipv4bind', ipv4BindingItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv4AddressItemName, config.get, None)
- ipv6BindingItem = AsteriskSCF.Media.RTP.V1.BindingIPv6Item()
- mapper.map('ipv6bind', ipv6BindingItem, 'address', AsteriskSCF.Media.RTP.V1.BindingIPv6AddressItemName, config.get, None)
+ ipv6BindingItem = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv6Item()
+ mapper.map('ipv6bind', ipv6BindingItem, 'address', AsteriskSCF.Configuration.MediaRTPPJMedia.V1.BindingIPv6AddressItemName, config.get, None)
for option in config.options(section):
mapper.execute(group, section, option)
@@ -54,8 +54,8 @@ class RtpSectionVisitors(Configurator.SectionVisitors):
self.groups.append(group)
# In order to do service locator based lookup we need to pass in a params object
-serviceLocatorParams = AsteriskSCF.Media.RTP.V1.RtpConfigurationParams()
-serviceLocatorParams.category = AsteriskSCF.Media.RTP.V1.ConfigurationDiscoveryCategory
+serviceLocatorParams = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.RtpConfigurationParams()
+serviceLocatorParams.category = AsteriskSCF.Configuration.MediaRTPPJMedia.V1.ConfigurationDiscoveryCategory
# Make a configurator application and let it run
app = Configurator.ConfiguratorApp('Rtp.config', RtpSectionVisitors(), None, serviceLocatorParams)
-----------------------------------------------------------------------
--
asterisk-scf/integration/media_rtp_pjmedia.git
More information about the asterisk-scf-commits
mailing list