[DEV] update of external of elog and ethread
This commit is contained in:
@@ -12,12 +12,12 @@ namespace river_test_aec {
|
||||
|
||||
class Linker {
|
||||
private:
|
||||
std11::shared_ptr<audio::river::Manager> m_manager;
|
||||
std11::shared_ptr<audio::river::Interface> m_interfaceOut;
|
||||
std11::shared_ptr<audio::river::Interface> m_interfaceIn;
|
||||
std::shared_ptr<audio::river::Manager> m_manager;
|
||||
std::shared_ptr<audio::river::Interface> m_interfaceOut;
|
||||
std::shared_ptr<audio::river::Interface> m_interfaceIn;
|
||||
audio::drain::CircularBuffer m_buffer;
|
||||
public:
|
||||
Linker(std11::shared_ptr<audio::river::Manager> _manager, const std::string& _input, const std::string& _output) :
|
||||
Linker(std::shared_ptr<audio::river::Manager> _manager, const std::string& _input, const std::string& _output) :
|
||||
m_manager(_manager) {
|
||||
//Set stereo output:
|
||||
std::vector<audio::channel> channelMap;
|
||||
@@ -27,7 +27,7 @@ namespace river_test_aec {
|
||||
channelMap.push_back(audio::channel_frontLeft);
|
||||
channelMap.push_back(audio::channel_frontRight);
|
||||
}
|
||||
m_buffer.setCapacity(std11::chrono::milliseconds(2000), sizeof(int16_t)*channelMap.size(), 48000);
|
||||
m_buffer.setCapacity(std::chrono::milliseconds(2000), sizeof(int16_t)*channelMap.size(), 48000);
|
||||
|
||||
m_interfaceOut = m_manager->createOutput(48000,
|
||||
channelMap,
|
||||
@@ -38,14 +38,14 @@ namespace river_test_aec {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interfaceOut->setOutputCallback(std11::bind(&Linker::onDataNeeded,
|
||||
m_interfaceOut->setOutputCallback(std::bind(&Linker::onDataNeeded,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
m_interfaceOut->addVolumeGroup("FLOW");
|
||||
if ("speaker" == _output) {
|
||||
m_interfaceOut->setParameter("volume", "FLOW", "0dB");
|
||||
@@ -60,14 +60,14 @@ namespace river_test_aec {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interfaceIn->setInputCallback(std11::bind(&Linker::onDataReceived,
|
||||
m_interfaceIn->setInputCallback(std::bind(&Linker::onDataReceived,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
|
||||
}
|
||||
void onDataNeeded(void* _data,
|
||||
@@ -198,10 +198,10 @@ namespace river_test_aec {
|
||||
|
||||
TEST(TestUser, testAECManually) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
std11::shared_ptr<Linker> processLink1 = std11::make_shared<Linker>(manager, "microphone-clean", "speaker");
|
||||
std11::shared_ptr<Linker> processLink2 = std11::make_shared<Linker>(manager, "microphone", "speaker-test");
|
||||
std::shared_ptr<Linker> processLink1 = std::make_shared<Linker>(manager, "microphone-clean", "speaker");
|
||||
std::shared_ptr<Linker> processLink2 = std::make_shared<Linker>(manager, "microphone", "speaker-test");
|
||||
processLink1->start();
|
||||
processLink2->start();
|
||||
sleep(30);
|
||||
|
@@ -13,14 +13,14 @@
|
||||
namespace river_test_echo_delay {
|
||||
class TestClass {
|
||||
private:
|
||||
std11::shared_ptr<audio::river::Manager> m_manager;
|
||||
std11::shared_ptr<audio::river::Interface> m_interfaceOut;
|
||||
std11::shared_ptr<audio::river::Interface> m_interfaceIn;
|
||||
std11::shared_ptr<audio::river::Interface> m_interfaceFB;
|
||||
std::shared_ptr<audio::river::Manager> m_manager;
|
||||
std::shared_ptr<audio::river::Interface> m_interfaceOut;
|
||||
std::shared_ptr<audio::river::Interface> m_interfaceIn;
|
||||
std::shared_ptr<audio::river::Interface> m_interfaceFB;
|
||||
double m_phase;
|
||||
double m_freq;
|
||||
int32_t m_nextSampleCount;
|
||||
std11::chrono::milliseconds m_delayBetweenEvent;
|
||||
std::chrono::milliseconds m_delayBetweenEvent;
|
||||
audio::Time m_nextTick;
|
||||
audio::Time m_currentTick;
|
||||
int32_t m_stateFB;
|
||||
@@ -31,7 +31,7 @@ namespace river_test_echo_delay {
|
||||
int16_t m_volumeInputMin;
|
||||
float m_gain;
|
||||
public:
|
||||
TestClass(std11::shared_ptr<audio::river::Manager> _manager) :
|
||||
TestClass(std::shared_ptr<audio::river::Manager> _manager) :
|
||||
m_manager(_manager),
|
||||
m_phase(0),
|
||||
m_freq(400),
|
||||
@@ -52,14 +52,14 @@ namespace river_test_echo_delay {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interfaceOut->setOutputCallback(std11::bind(&TestClass::onDataNeeded,
|
||||
m_interfaceOut->setOutputCallback(std::bind(&TestClass::onDataNeeded,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
m_interfaceOut->addVolumeGroup("FLOW");
|
||||
m_interfaceOut->setParameter("volume", "FLOW", etk::to_string(m_gain) + "dB");
|
||||
|
||||
@@ -72,14 +72,14 @@ namespace river_test_echo_delay {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interfaceIn->setInputCallback(std11::bind(&TestClass::onDataReceived,
|
||||
m_interfaceIn->setInputCallback(std::bind(&TestClass::onDataReceived,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
|
||||
m_interfaceFB = m_manager->createFeedback(48000,
|
||||
channelMap,
|
||||
@@ -90,14 +90,14 @@ namespace river_test_echo_delay {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interfaceFB->setInputCallback(std11::bind(&TestClass::onDataReceivedFeedBack,
|
||||
m_interfaceFB->setInputCallback(std::bind(&TestClass::onDataReceivedFeedBack,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
|
||||
m_manager->generateDotAll("activeProcess.dot");
|
||||
}
|
||||
@@ -416,9 +416,9 @@ namespace river_test_echo_delay {
|
||||
|
||||
TEST(TestTime, testDelay) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
std11::shared_ptr<TestClass> process = std11::make_shared<TestClass>(manager);
|
||||
std::shared_ptr<TestClass> process = std::make_shared<TestClass>(manager);
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
|
@@ -26,15 +26,15 @@ namespace river_test_format {
|
||||
"}\n";
|
||||
class testOutCallbackType {
|
||||
private:
|
||||
std11::shared_ptr<audio::river::Manager> m_manager;
|
||||
std11::shared_ptr<audio::river::Interface> m_interface;
|
||||
std::shared_ptr<audio::river::Manager> m_manager;
|
||||
std::shared_ptr<audio::river::Interface> m_interface;
|
||||
double m_phase;
|
||||
float m_freq;
|
||||
int32_t m_nbChannels;
|
||||
float m_generateFreq;
|
||||
|
||||
public:
|
||||
testOutCallbackType(const std11::shared_ptr<audio::river::Manager>& _manager,
|
||||
testOutCallbackType(const std::shared_ptr<audio::river::Manager>& _manager,
|
||||
float _freq=48000.0f,
|
||||
int32_t _nbChannels=2,
|
||||
audio::format _format=audio::format_int16) :
|
||||
@@ -69,14 +69,14 @@ namespace river_test_format {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interface->setOutputCallback(std11::bind(&testOutCallbackType::onDataNeeded,
|
||||
m_interface->setOutputCallback(std::bind(&testOutCallbackType::onDataNeeded,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
}
|
||||
void onDataNeeded(void* _data,
|
||||
const audio::Time& _time,
|
||||
@@ -149,9 +149,9 @@ namespace river_test_format {
|
||||
class testResampling : public ::testing::TestWithParam<float> {};
|
||||
TEST_P(testResampling, base) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
std11::shared_ptr<testOutCallbackType> process = std11::make_shared<testOutCallbackType>(manager, GetParam(), 2, audio::format_int16);
|
||||
std::shared_ptr<testOutCallbackType> process = std::make_shared<testOutCallbackType>(manager, GetParam(), 2, audio::format_int16);
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
@@ -166,9 +166,9 @@ namespace river_test_format {
|
||||
class testFormat : public ::testing::TestWithParam<audio::format> {};
|
||||
TEST_P(testFormat, base) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
std11::shared_ptr<testOutCallbackType> process = std11::make_shared<testOutCallbackType>(manager, 48000, 2, GetParam());
|
||||
std::shared_ptr<testOutCallbackType> process = std::make_shared<testOutCallbackType>(manager, 48000, 2, GetParam());
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
@@ -182,9 +182,9 @@ namespace river_test_format {
|
||||
class testChannels : public ::testing::TestWithParam<int32_t> {};
|
||||
TEST_P(testChannels, base) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
std11::shared_ptr<testOutCallbackType> process = std11::make_shared<testOutCallbackType>(manager, 48000, GetParam(), audio::format_int16);
|
||||
std::shared_ptr<testOutCallbackType> process = std::make_shared<testOutCallbackType>(manager, 48000, GetParam(), audio::format_int16);
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
@@ -197,7 +197,7 @@ namespace river_test_format {
|
||||
|
||||
TEST(TestALL, testChannelsFormatResampling) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
TEST_INFO("test convert flaot to output (callback mode)");
|
||||
std::vector<float> listFreq;
|
||||
@@ -226,7 +226,7 @@ namespace river_test_format {
|
||||
for (size_t ccc=0; ccc<listChannel.size(); ++ccc) {
|
||||
for (size_t iii=0; iii<listFormat.size(); ++iii) {
|
||||
TEST_INFO("freq=" << listFreq[fff] << " channel=" << listChannel[ccc] << " format=" << getFormatString(listFormat[iii]));
|
||||
std11::shared_ptr<testOutCallbackType> process = std11::make_shared<testOutCallbackType>(manager, listFreq[fff], listChannel[ccc], listFormat[iii]);
|
||||
std::shared_ptr<testOutCallbackType> process = std::make_shared<testOutCallbackType>(manager, listFreq[fff], listChannel[ccc], listFormat[iii]);
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
|
@@ -13,12 +13,12 @@
|
||||
namespace river_test_muxer {
|
||||
class TestClass {
|
||||
private:
|
||||
std11::shared_ptr<audio::river::Manager> m_manager;
|
||||
std11::shared_ptr<audio::river::Interface> m_interfaceIn;
|
||||
std11::shared_ptr<audio::river::Interface> m_interfaceOut;
|
||||
std::shared_ptr<audio::river::Manager> m_manager;
|
||||
std::shared_ptr<audio::river::Interface> m_interfaceIn;
|
||||
std::shared_ptr<audio::river::Interface> m_interfaceOut;
|
||||
double m_phase;
|
||||
public:
|
||||
TestClass(std11::shared_ptr<audio::river::Manager> _manager) :
|
||||
TestClass(std::shared_ptr<audio::river::Manager> _manager) :
|
||||
m_manager(_manager),
|
||||
m_phase(0) {
|
||||
std::vector<audio::channel> channelMap;
|
||||
@@ -33,14 +33,14 @@ namespace river_test_muxer {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interfaceOut->setOutputCallback(std11::bind(&TestClass::onDataNeeded,
|
||||
m_interfaceOut->setOutputCallback(std::bind(&TestClass::onDataNeeded,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
m_interfaceOut->addVolumeGroup("FLOW");
|
||||
//m_interfaceOut->setParameter("volume", "FLOW", "-6dB");
|
||||
|
||||
@@ -54,14 +54,14 @@ namespace river_test_muxer {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interfaceIn->setInputCallback(std11::bind(&TestClass::onDataReceived,
|
||||
m_interfaceIn->setInputCallback(std::bind(&TestClass::onDataReceived,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
m_manager->generateDotAll("activeProcess.dot");
|
||||
}
|
||||
|
||||
@@ -166,9 +166,9 @@ namespace river_test_muxer {
|
||||
|
||||
TEST(TestMuxer, testMuxing) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
std11::shared_ptr<TestClass> process = std11::make_shared<TestClass>(manager);
|
||||
std::shared_ptr<TestClass> process = std::make_shared<TestClass>(manager);
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
|
@@ -12,11 +12,11 @@ namespace river_test_playback_callback {
|
||||
|
||||
class testOutCallback {
|
||||
public:
|
||||
std11::shared_ptr<audio::river::Manager> m_manager;
|
||||
std11::shared_ptr<audio::river::Interface> m_interface;
|
||||
std::shared_ptr<audio::river::Manager> m_manager;
|
||||
std::shared_ptr<audio::river::Interface> m_interface;
|
||||
double m_phase;
|
||||
public:
|
||||
testOutCallback(std11::shared_ptr<audio::river::Manager> _manager, const std::string& _io="speaker") :
|
||||
testOutCallback(std::shared_ptr<audio::river::Manager> _manager, const std::string& _io="speaker") :
|
||||
m_manager(_manager),
|
||||
m_phase(0) {
|
||||
//Set stereo output:
|
||||
@@ -32,14 +32,14 @@ namespace river_test_playback_callback {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interface->setOutputCallback(std11::bind(&testOutCallback::onDataNeeded,
|
||||
m_interface->setOutputCallback(std::bind(&testOutCallback::onDataNeeded,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
}
|
||||
void onDataNeeded(void* _data,
|
||||
const audio::Time& _time,
|
||||
@@ -92,11 +92,11 @@ namespace river_test_playback_callback {
|
||||
|
||||
TEST(TestALL, testOutputCallBack) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
|
||||
TEST_INFO("test output (callback mode)");
|
||||
std11::shared_ptr<testOutCallback> process = std11::make_shared<testOutCallback>(manager, "speaker");
|
||||
std::shared_ptr<testOutCallback> process = std::make_shared<testOutCallback>(manager, "speaker");
|
||||
ASSERT_NE(process, nullptr);
|
||||
process->run();
|
||||
process.reset();
|
||||
@@ -106,11 +106,11 @@ namespace river_test_playback_callback {
|
||||
|
||||
TEST(TestALL, testOutputCallBackPulse) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
|
||||
TEST_INFO("test output (callback mode)");
|
||||
std11::shared_ptr<testOutCallback> process = std11::make_shared<testOutCallback>(manager, "speaker-pulse");
|
||||
std::shared_ptr<testOutCallback> process = std::make_shared<testOutCallback>(manager, "speaker-pulse");
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
@@ -119,11 +119,11 @@ namespace river_test_playback_callback {
|
||||
|
||||
TEST(TestALL, testOutputCallBackJack) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
|
||||
TEST_INFO("test output (callback mode)");
|
||||
std11::shared_ptr<testOutCallback> process = std11::make_shared<testOutCallback>(manager, "speaker-jack");
|
||||
std::shared_ptr<testOutCallback> process = std::make_shared<testOutCallback>(manager, "speaker-jack");
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
|
@@ -28,10 +28,10 @@ namespace river_test_playback_write {
|
||||
class testOutWrite {
|
||||
public:
|
||||
std::vector<audio::channel> m_channelMap;
|
||||
std11::shared_ptr<audio::river::Manager> m_manager;
|
||||
std11::shared_ptr<audio::river::Interface> m_interface;
|
||||
std::shared_ptr<audio::river::Manager> m_manager;
|
||||
std::shared_ptr<audio::river::Interface> m_interface;
|
||||
public:
|
||||
testOutWrite(std11::shared_ptr<audio::river::Manager> _manager) :
|
||||
testOutWrite(std::shared_ptr<audio::river::Manager> _manager) :
|
||||
m_manager(_manager) {
|
||||
//Set stereo output:
|
||||
m_channelMap.push_back(audio::channel_frontLeft);
|
||||
@@ -89,11 +89,11 @@ namespace river_test_playback_write {
|
||||
|
||||
TEST(TestALL, testOutputWrite) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
|
||||
TEST_INFO("test output (write mode)");
|
||||
std11::shared_ptr<testOutWrite> process = std11::make_shared<testOutWrite>(manager);
|
||||
std::shared_ptr<testOutWrite> process = std::make_shared<testOutWrite>(manager);
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
@@ -102,11 +102,11 @@ namespace river_test_playback_write {
|
||||
|
||||
class testOutWriteCallback {
|
||||
public:
|
||||
std11::shared_ptr<audio::river::Manager> m_manager;
|
||||
std11::shared_ptr<audio::river::Interface> m_interface;
|
||||
std::shared_ptr<audio::river::Manager> m_manager;
|
||||
std::shared_ptr<audio::river::Interface> m_interface;
|
||||
double m_phase;
|
||||
public:
|
||||
testOutWriteCallback(std11::shared_ptr<audio::river::Manager> _manager) :
|
||||
testOutWriteCallback(std::shared_ptr<audio::river::Manager> _manager) :
|
||||
m_manager(_manager),
|
||||
m_phase(0) {
|
||||
std::vector<audio::channel> channelMap;
|
||||
@@ -122,13 +122,13 @@ namespace river_test_playback_write {
|
||||
return;
|
||||
}
|
||||
m_interface->setReadwrite();
|
||||
m_interface->setWriteCallback(std11::bind(&testOutWriteCallback::onDataNeeded,
|
||||
m_interface->setWriteCallback(std::bind(&testOutWriteCallback::onDataNeeded,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5));
|
||||
}
|
||||
void onDataNeeded(const audio::Time& _time,
|
||||
size_t _nbChunk,
|
||||
@@ -166,11 +166,11 @@ namespace river_test_playback_write {
|
||||
|
||||
TEST(TestALL, testOutputWriteWithCallback) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
|
||||
TEST_INFO("test output (write with callback event mode)");
|
||||
std11::shared_ptr<testOutWriteCallback> process = std11::make_shared<testOutWriteCallback>(manager);
|
||||
std::shared_ptr<testOutWriteCallback> process = std::make_shared<testOutWriteCallback>(manager);
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
|
@@ -28,10 +28,10 @@ namespace river_test_record_callback {
|
||||
|
||||
class testInCallback {
|
||||
public:
|
||||
std11::shared_ptr<audio::river::Manager> m_manager;
|
||||
std11::shared_ptr<audio::river::Interface> m_interface;
|
||||
std::shared_ptr<audio::river::Manager> m_manager;
|
||||
std::shared_ptr<audio::river::Interface> m_interface;
|
||||
public:
|
||||
testInCallback(std11::shared_ptr<audio::river::Manager> _manager, const std::string& _input="microphone") :
|
||||
testInCallback(std::shared_ptr<audio::river::Manager> _manager, const std::string& _input="microphone") :
|
||||
m_manager(_manager) {
|
||||
//Set stereo output:
|
||||
std::vector<audio::channel> channelMap;
|
||||
@@ -44,14 +44,14 @@ namespace river_test_record_callback {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interface->setInputCallback(std11::bind(&testInCallback::onDataReceived,
|
||||
m_interface->setInputCallback(std::bind(&testInCallback::onDataReceived,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
}
|
||||
void onDataReceived(const void* _data,
|
||||
const audio::Time& _time,
|
||||
@@ -85,10 +85,10 @@ namespace river_test_record_callback {
|
||||
|
||||
TEST(TestALL, testInputCallBack) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
TEST_INFO("test input (callback mode)");
|
||||
std11::shared_ptr<testInCallback> process = std11::make_shared<testInCallback>(manager);
|
||||
std::shared_ptr<testInCallback> process = std::make_shared<testInCallback>(manager);
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
|
@@ -27,11 +27,11 @@ namespace river_test_volume {
|
||||
|
||||
class testCallbackVolume {
|
||||
private:
|
||||
std11::shared_ptr<audio::river::Manager> m_manager;
|
||||
std11::shared_ptr<audio::river::Interface> m_interface;
|
||||
std::shared_ptr<audio::river::Manager> m_manager;
|
||||
std::shared_ptr<audio::river::Interface> m_interface;
|
||||
double m_phase;
|
||||
public:
|
||||
testCallbackVolume(std11::shared_ptr<audio::river::Manager> _manager) :
|
||||
testCallbackVolume(std::shared_ptr<audio::river::Manager> _manager) :
|
||||
m_manager(_manager),
|
||||
m_phase(0) {
|
||||
//Set stereo output:
|
||||
@@ -47,14 +47,14 @@ namespace river_test_volume {
|
||||
return;
|
||||
}
|
||||
// set callback mode ...
|
||||
m_interface->setOutputCallback(std11::bind(&testCallbackVolume::onDataNeeded,
|
||||
m_interface->setOutputCallback(std::bind(&testCallbackVolume::onDataNeeded,
|
||||
this,
|
||||
std11::placeholders::_1,
|
||||
std11::placeholders::_2,
|
||||
std11::placeholders::_3,
|
||||
std11::placeholders::_4,
|
||||
std11::placeholders::_5,
|
||||
std11::placeholders::_6));
|
||||
std::placeholders::_1,
|
||||
std::placeholders::_2,
|
||||
std::placeholders::_3,
|
||||
std::placeholders::_4,
|
||||
std::placeholders::_5,
|
||||
std::placeholders::_6));
|
||||
m_interface->addVolumeGroup("MEDIA");
|
||||
m_interface->addVolumeGroup("FLOW");
|
||||
}
|
||||
@@ -122,9 +122,9 @@ namespace river_test_volume {
|
||||
|
||||
TEST(TestALL, testVolume) {
|
||||
audio::river::initString(configurationRiver);
|
||||
std11::shared_ptr<audio::river::Manager> manager;
|
||||
std::shared_ptr<audio::river::Manager> manager;
|
||||
manager = audio::river::Manager::create("testApplication");
|
||||
std11::shared_ptr<testCallbackVolume> process = std11::make_shared<testCallbackVolume>(manager);
|
||||
std::shared_ptr<testCallbackVolume> process = std::make_shared<testCallbackVolume>(manager);
|
||||
process->run();
|
||||
process.reset();
|
||||
usleep(500000);
|
||||
|
Reference in New Issue
Block a user