[asterisk-scf-commits] asterisk-scf/integration/media_operations_core.git branch "retry_deux" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Mar 5 09:32:17 CST 2012
branch "retry_deux" has been updated
via 8c3d88469962d52d5c8209bf2ba562fd7e3d99e5 (commit)
from 35af73f185554cc3705bfb774caeae2233bd7130 (commit)
Summary of changes:
test/TestMediaOperations.cpp | 124 +++++++++++++++++++++---------------------
test/TestStreamSink.cpp | 2 +-
test/TestStreamSink.h | 2 +-
test/TestStreamSource.cpp | 4 +-
test/TestStreamSource.h | 4 +-
5 files changed, 68 insertions(+), 68 deletions(-)
- Log -----------------------------------------------------------------
commit 8c3d88469962d52d5c8209bf2ba562fd7e3d99e5
Author: Brent Eagles <beagles at digium.com>
Date: Mon Mar 5 12:01:23 2012 -0330
Update sources to comply with recent slice changes.
diff --git a/test/TestMediaOperations.cpp b/test/TestMediaOperations.cpp
index e963177..ca5c6c1 100644
--- a/test/TestMediaOperations.cpp
+++ b/test/TestMediaOperations.cpp
@@ -468,11 +468,11 @@ BOOST_FIXTURE_TEST_CASE(createMediaOperations, PerTestFixture)
//translators and ulaw to alaw translators even though we searched for the factory with
//an input of alaw and an output of ulaw.
MediaOperationPrx alaw2ulawTranslator =
- ulawAlawFactory->createMediaOperation(AsteriskSCF::createContext(),
+ ulawAlawFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.alawSourceProxy, Testbed.ulawSinkProxy);
MediaOperationPrx ulaw2alawTranslator =
- ulawAlawFactory->createMediaOperation(AsteriskSCF::createContext(),
+ ulawAlawFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.ulawSourceProxy, Testbed.alawSinkProxy);
BOOST_CHECK(alaw2ulawTranslator != 0);
@@ -498,17 +498,17 @@ BOOST_FIXTURE_TEST_CASE(translateAlawToUlaw, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(alaw2ulawParams));
MediaOperationPrx alaw2ulawTranslator =
- alaw2ulawFactory->createMediaOperation(AsteriskSCF::createContext(),
+ alaw2ulawFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.alawSourceProxy, Testbed.ulawSinkProxy);
StreamSinkPrx translateSink = alaw2ulawTranslator->getSink();
StreamSourcePrx translateSource = alaw2ulawTranslator->getSource();
- Testbed.alawSourceProxy->addSink(translateSink);
- Testbed.ulawSinkProxy->setSource(translateSource);
+ Testbed.alawSourceProxy->addSink(AsteriskSCF::Operations::createContext(), translateSink);
+ Testbed.ulawSinkProxy->setSource(AsteriskSCF::Operations::createContext(), translateSource);
- translateSource->addSink(Testbed.ulawSinkProxy);
- translateSink->setSource(Testbed.alawSourceProxy);
+ translateSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.ulawSinkProxy);
+ translateSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.alawSourceProxy);
//We'll feed a few of the sample frames in.
FrameSeq alawFrames(numFramesToTranslate, Testbed.sampleAlawFrame);
@@ -559,17 +559,17 @@ BOOST_FIXTURE_TEST_CASE(translateAlawToSlin8, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(alaw2slin8Params));
MediaOperationPrx alaw2slin8Translator =
- alaw2slin8Factory->createMediaOperation(AsteriskSCF::createContext(),
+ alaw2slin8Factory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.alawSourceProxy, Testbed.slin8SinkProxy);
StreamSinkPrx translateSink = alaw2slin8Translator->getSink();
StreamSourcePrx translateSource = alaw2slin8Translator->getSource();
- Testbed.alawSourceProxy->addSink(translateSink);
- Testbed.slin8SinkProxy->setSource(translateSource);
+ Testbed.alawSourceProxy->addSink(AsteriskSCF::Operations::createContext(), translateSink);
+ Testbed.slin8SinkProxy->setSource(AsteriskSCF::Operations::createContext(), translateSource);
- translateSource->addSink(Testbed.slin8SinkProxy);
- translateSink->setSource(Testbed.alawSourceProxy);
+ translateSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.slin8SinkProxy);
+ translateSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.alawSourceProxy);
//We'll feed a few of the sample frames in.
FrameSeq alawFrames(numFramesToTranslate, Testbed.sampleAlawFrame);
@@ -621,17 +621,17 @@ BOOST_FIXTURE_TEST_CASE(translateSlin8ToAlaw, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(slin82AlawParams));
MediaOperationPrx slin82AlawTranslator =
- slin82AlawFactory->createMediaOperation(AsteriskSCF::createContext(),
+ slin82AlawFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.slin8SourceProxy, Testbed.alawSinkProxy);
StreamSinkPrx translateSink = slin82AlawTranslator->getSink();
StreamSourcePrx translateSource = slin82AlawTranslator->getSource();
- Testbed.slin8SourceProxy->addSink(translateSink);
- Testbed.alawSinkProxy->setSource(translateSource);
+ Testbed.slin8SourceProxy->addSink(AsteriskSCF::Operations::createContext(), translateSink);
+ Testbed.alawSinkProxy->setSource(AsteriskSCF::Operations::createContext(), translateSource);
- translateSource->addSink(Testbed.alawSinkProxy);
- translateSink->setSource(Testbed.slin8SourceProxy);
+ translateSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.alawSinkProxy);
+ translateSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.slin8SourceProxy);
//We'll feed a few of the sample frames in.
FrameSeq slin8Frames(numFramesToTranslate, Testbed.sampleSlin8Frame);
@@ -683,17 +683,17 @@ BOOST_FIXTURE_TEST_CASE(translateUlawToAlaw, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(ulaw2alawParams));
MediaOperationPrx ulaw2alawTranslator =
- ulaw2alawFactory->createMediaOperation(AsteriskSCF::createContext(),
+ ulaw2alawFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.ulawSourceProxy, Testbed.alawSinkProxy);
StreamSinkPrx translateSink = ulaw2alawTranslator->getSink();
StreamSourcePrx translateSource = ulaw2alawTranslator->getSource();
- Testbed.ulawSourceProxy->addSink(translateSink);
- Testbed.alawSinkProxy->setSource(translateSource);
+ Testbed.ulawSourceProxy->addSink(AsteriskSCF::Operations::createContext(), translateSink);
+ Testbed.alawSinkProxy->setSource(AsteriskSCF::Operations::createContext(), translateSource);
- translateSource->addSink(Testbed.alawSinkProxy);
- translateSink->setSource(Testbed.ulawSourceProxy);
+ translateSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.alawSinkProxy);
+ translateSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.ulawSourceProxy);
//We'll feed a few of the sample frames in.
FrameSeq ulawFrames(numFramesToTranslate, Testbed.sampleUlawFrame);
@@ -745,17 +745,17 @@ BOOST_FIXTURE_TEST_CASE(translateUlawToSlin8, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(ulaw2slin8Params));
MediaOperationPrx ulaw2slin8Translator =
- ulaw2slin8Factory->createMediaOperation(AsteriskSCF::createContext(),
+ ulaw2slin8Factory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.ulawSourceProxy, Testbed.slin8SinkProxy);
StreamSinkPrx translateSink = ulaw2slin8Translator->getSink();
StreamSourcePrx translateSource = ulaw2slin8Translator->getSource();
- Testbed.ulawSourceProxy->addSink(translateSink);
- Testbed.slin8SinkProxy->setSource(translateSource);
+ Testbed.ulawSourceProxy->addSink(AsteriskSCF::Operations::createContext(), translateSink);
+ Testbed.slin8SinkProxy->setSource(AsteriskSCF::Operations::createContext(), translateSource);
- translateSource->addSink(Testbed.slin8SinkProxy);
- translateSink->setSource(Testbed.ulawSourceProxy);
+ translateSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.slin8SinkProxy);
+ translateSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.ulawSourceProxy);
//We'll feed a few of the sample frames in.
FrameSeq ulawFrames(numFramesToTranslate, Testbed.sampleUlawFrame);
@@ -807,17 +807,17 @@ BOOST_FIXTURE_TEST_CASE(translateSlin8ToUlaw, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(slin82UlawParams));
MediaOperationPrx slin82UlawTranslator =
- slin82UlawFactory->createMediaOperation(AsteriskSCF::createContext(),
+ slin82UlawFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.slin8SourceProxy, Testbed.ulawSinkProxy);
StreamSinkPrx translateSink = slin82UlawTranslator->getSink();
StreamSourcePrx translateSource = slin82UlawTranslator->getSource();
- Testbed.slin8SourceProxy->addSink(translateSink);
- Testbed.ulawSinkProxy->setSource(translateSource);
+ Testbed.slin8SourceProxy->addSink(AsteriskSCF::Operations::createContext(), translateSink);
+ Testbed.ulawSinkProxy->setSource(AsteriskSCF::Operations::createContext(), translateSource);
- translateSource->addSink(Testbed.ulawSinkProxy);
- translateSink->setSource(Testbed.slin8SourceProxy);
+ translateSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.ulawSinkProxy);
+ translateSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.slin8SourceProxy);
//We'll feed a few of the sample frames in.
FrameSeq slin8Frames(numFramesToTranslate, Testbed.sampleSlin8Frame);
@@ -874,17 +874,17 @@ BOOST_FIXTURE_TEST_CASE(resample8To16, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(eightToSixteenParams));
MediaOperationPrx eightToSixteenResampler =
- eightToSixteenFactory->createMediaOperation(AsteriskSCF::createContext(),
+ eightToSixteenFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.slin8SourceProxy, Testbed.slin16SinkProxy);
StreamSinkPrx resampleSink = eightToSixteenResampler->getSink();
StreamSourcePrx resampleSource = eightToSixteenResampler->getSource();
- Testbed.slin8SourceProxy->addSink(resampleSink);
- Testbed.slin16SinkProxy->setSource(resampleSource);
+ Testbed.slin8SourceProxy->addSink(AsteriskSCF::Operations::createContext(), resampleSink);
+ Testbed.slin16SinkProxy->setSource(AsteriskSCF::Operations::createContext(), resampleSource);
- resampleSource->addSink(Testbed.slin16SinkProxy);
- resampleSink->setSource(Testbed.slin8SourceProxy);
+ resampleSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.slin16SinkProxy);
+ resampleSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.slin8SourceProxy);
FrameSeq slin8Frames(numFramesToTranslate, Testbed.sampleSlin8Frame);
@@ -934,17 +934,17 @@ BOOST_FIXTURE_TEST_CASE(resample16To8, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(sixteenToEightParams));
MediaOperationPrx sixteenToEightResampler =
- sixteenToEightFactory->createMediaOperation(AsteriskSCF::createContext(),
+ sixteenToEightFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.slin16SourceProxy, Testbed.slin8SinkProxy);
StreamSinkPrx resampleSink = sixteenToEightResampler->getSink();
StreamSourcePrx resampleSource = sixteenToEightResampler->getSource();
- Testbed.slin16SourceProxy->addSink(resampleSink);
- Testbed.slin8SinkProxy->setSource(resampleSource);
+ Testbed.slin16SourceProxy->addSink(AsteriskSCF::Operations::createContext(), resampleSink);
+ Testbed.slin8SinkProxy->setSource(AsteriskSCF::Operations::createContext(), resampleSource);
- resampleSource->addSink(Testbed.slin8SinkProxy);
- resampleSink->setSource(Testbed.slin16SourceProxy);
+ resampleSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.slin8SinkProxy);
+ resampleSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.slin16SourceProxy);
FrameSeq slin16Frames(numFramesToTranslate, Testbed.sampleSlin16Frame);
@@ -994,17 +994,17 @@ BOOST_FIXTURE_TEST_CASE(slin8toG722, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(slinToG722Params));
MediaOperationPrx slinToG722Translator =
- slinToG722Factory->createMediaOperation(AsteriskSCF::createContext(),
+ slinToG722Factory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.slin8SourceProxy, Testbed.g722SinkProxy);
StreamSinkPrx translatorSink = slinToG722Translator->getSink();
StreamSourcePrx translatorSource = slinToG722Translator->getSource();
- Testbed.slin8SourceProxy->addSink(translatorSink);
- Testbed.g722SinkProxy->setSource(translatorSource);
+ Testbed.slin8SourceProxy->addSink(AsteriskSCF::Operations::createContext(), translatorSink);
+ Testbed.g722SinkProxy->setSource(AsteriskSCF::Operations::createContext(), translatorSource);
- translatorSource->addSink(Testbed.g722SinkProxy);
- translatorSink->setSource(Testbed.slin8SourceProxy);
+ translatorSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.g722SinkProxy);
+ translatorSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.slin8SourceProxy);
FrameSeq slin8Frames(numFramesToTranslate, Testbed.sampleSlin8Frame);
@@ -1054,17 +1054,17 @@ BOOST_FIXTURE_TEST_CASE(slin16toG722, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(slinToG722Params));
MediaOperationPrx slinToG722Translator =
- slinToG722Factory->createMediaOperation(AsteriskSCF::createContext(),
+ slinToG722Factory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.slin16SourceProxy, Testbed.g722SinkProxy);
StreamSinkPrx translatorSink = slinToG722Translator->getSink();
StreamSourcePrx translatorSource = slinToG722Translator->getSource();
- Testbed.slin16SourceProxy->addSink(translatorSink);
- Testbed.g722SinkProxy->setSource(translatorSource);
+ Testbed.slin16SourceProxy->addSink(AsteriskSCF::Operations::createContext(), translatorSink);
+ Testbed.g722SinkProxy->setSource(AsteriskSCF::Operations::createContext(), translatorSource);
- translatorSource->addSink(Testbed.g722SinkProxy);
- translatorSink->setSource(Testbed.slin16SourceProxy);
+ translatorSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.g722SinkProxy);
+ translatorSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.slin16SourceProxy);
FrameSeq slin16Frames(numFramesToTranslate, Testbed.sampleSlin16Frame);
@@ -1114,17 +1114,17 @@ BOOST_FIXTURE_TEST_CASE(g722ToSlin8, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(g722ToSlinParams));
MediaOperationPrx g722ToSlinTranslator =
- g722ToSlinFactory->createMediaOperation(AsteriskSCF::createContext(),
+ g722ToSlinFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.g722SourceProxy, Testbed.slin8SinkProxy);
StreamSinkPrx translatorSink = g722ToSlinTranslator->getSink();
StreamSourcePrx translatorSource = g722ToSlinTranslator->getSource();
- Testbed.g722SourceProxy->addSink(translatorSink);
- Testbed.slin8SinkProxy->setSource(translatorSource);
+ Testbed.g722SourceProxy->addSink(AsteriskSCF::Operations::createContext(), translatorSink);
+ Testbed.slin8SinkProxy->setSource(AsteriskSCF::Operations::createContext(), translatorSource);
- translatorSource->addSink(Testbed.slin8SinkProxy);
- translatorSink->setSource(Testbed.g722SourceProxy);
+ translatorSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.slin8SinkProxy);
+ translatorSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.g722SourceProxy);
FrameSeq g722Frames(numFramesToTranslate, Testbed.sampleG722Frame);
@@ -1174,17 +1174,17 @@ BOOST_FIXTURE_TEST_CASE(g722ToSlin16, PerTestFixture)
MediaOperationFactoryPrx::checkedCast(Testbed.locator->locate(g722ToSlinParams));
MediaOperationPrx g722ToSlinTranslator =
- g722ToSlinFactory->createMediaOperation(AsteriskSCF::createContext(),
+ g722ToSlinFactory->createMediaOperation(AsteriskSCF::Operations::createContext(),
Testbed.g722SourceProxy, Testbed.slin16SinkProxy);
StreamSinkPrx translatorSink = g722ToSlinTranslator->getSink();
StreamSourcePrx translatorSource = g722ToSlinTranslator->getSource();
- Testbed.g722SourceProxy->addSink(translatorSink);
- Testbed.slin16SinkProxy->setSource(translatorSource);
+ Testbed.g722SourceProxy->addSink(AsteriskSCF::Operations::createContext(), translatorSink);
+ Testbed.slin16SinkProxy->setSource(AsteriskSCF::Operations::createContext(), translatorSource);
- translatorSource->addSink(Testbed.slin16SinkProxy);
- translatorSink->setSource(Testbed.g722SourceProxy);
+ translatorSource->addSink(AsteriskSCF::Operations::createContext(), Testbed.slin16SinkProxy);
+ translatorSink->setSource(AsteriskSCF::Operations::createContext(), Testbed.g722SourceProxy);
FrameSeq g722Frames(numFramesToTranslate, Testbed.sampleG722Frame);
diff --git a/test/TestStreamSink.cpp b/test/TestStreamSink.cpp
index 1abf36c..888a15c 100644
--- a/test/TestStreamSink.cpp
+++ b/test/TestStreamSink.cpp
@@ -33,7 +33,7 @@ void TestStreamSink::write(const FrameSeq& frames, const Ice::Current&)
/**
* Implementation of the setSource method which just stores the source away for later retrieval.
*/
-void TestStreamSink::setSource(const StreamSourcePrx& source, const Ice::Current&)
+void TestStreamSink::setSource(const AsteriskSCF::System::V1::OperationContextPtr&, const StreamSourcePrx& source, const Ice::Current&)
{
mSource = source;
}
diff --git a/test/TestStreamSink.h b/test/TestStreamSink.h
index 4278950..65db80a 100644
--- a/test/TestStreamSink.h
+++ b/test/TestStreamSink.h
@@ -30,7 +30,7 @@ public:
/**
* Implementation of the setSource method which just stores the source away for later retrieval.
*/
- void setSource(const AsteriskSCF::Media::V1::StreamSourcePrx& source, const Ice::Current&);
+ void setSource(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::Media::V1::StreamSourcePrx& source, const Ice::Current&);
/**
* Implementation of the getSource method which just pulls the source back out.
diff --git a/test/TestStreamSource.cpp b/test/TestStreamSource.cpp
index 2ed9920..f824fe5 100644
--- a/test/TestStreamSource.cpp
+++ b/test/TestStreamSource.cpp
@@ -26,7 +26,7 @@ TestStreamSource::TestStreamSource(const FormatPtr& format)
/**
* Implementation of addSink that tacks a new sink onto our list
*/
-void TestStreamSource::addSink(const StreamSinkPrx& sink, const Ice::Current&)
+void TestStreamSource::addSink(const AsteriskSCF::System::V1::OperationContextPtr&, const StreamSinkPrx& sink, const Ice::Current&)
{
mSinks.push_back(sink);
}
@@ -34,7 +34,7 @@ void TestStreamSource::addSink(const StreamSinkPrx& sink, const Ice::Current&)
/**
* Implementation of removeSink that removes a sink from our list
*/
-void TestStreamSource::removeSink(const StreamSinkPrx& sink, const Ice::Current&)
+void TestStreamSource::removeSink(const AsteriskSCF::System::V1::OperationContextPtr&, const StreamSinkPrx& sink, const Ice::Current&)
{
mSinks.erase(std::remove(mSinks.begin(), mSinks.end(), sink), mSinks.end());
}
diff --git a/test/TestStreamSource.h b/test/TestStreamSource.h
index 14f5e32..b7464ea 100644
--- a/test/TestStreamSource.h
+++ b/test/TestStreamSource.h
@@ -25,12 +25,12 @@ public:
/**
* Implementation of addSink that tacks a new sink onto our list
*/
- void addSink(const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&);
+ void addSink(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&);
/**
* Implementation of removeSink that removes a sink from our list
*/
- void removeSink(const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&);
+ void removeSink(const AsteriskSCF::System::V1::OperationContextPtr&, const AsteriskSCF::Media::V1::StreamSinkPrx& sink, const Ice::Current&);
/**
* Implementation of the getSinks that returns sinks that have been added.
-----------------------------------------------------------------------
--
asterisk-scf/integration/media_operations_core.git
More information about the asterisk-scf-commits
mailing list