musicdsp/audio-river
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] correct the test and catkin build

Browse Source
This commit is contained in:
Edouard DUPIN 2015-03-13 23:54:54 +01:00
parent 0d448bed76
commit 08ae045bf0
9 changed files with 96 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
catkin/CMakeLists.txt
View File

@ -43,6 +43,7 @@ include_directories(
## Declare a cpp library ## Declare a cpp library
add_library(${PROJECT_NAME} add_library(${PROJECT_NAME}
../${PROJECT_NAME}/debug.cpp ../${PROJECT_NAME}/debug.cpp
../${PROJECT_NAME}/river.cpp
../${PROJECT_NAME}/Manager.cpp ../${PROJECT_NAME}/Manager.cpp
../${PROJECT_NAME}/Interface.cpp ../${PROJECT_NAME}/Interface.cpp
../${PROJECT_NAME}/CircularBuffer.cpp ../${PROJECT_NAME}/CircularBuffer.cpp

4
test/catkin/CMakeLists.txt
View File

@ -54,7 +54,3 @@ install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
) )
install(DIRECTORY ../../data/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
FILES_MATCHING PATTERN "*.json")

27
test/testEchoDelay.h
View File

@ -49,7 +49,10 @@ namespace river_test_echo_delay {
channelMap, channelMap,
audio::format_int16, audio::format_int16,
"speaker"); "speaker");
EXPECT_NE(m_interfaceOut, nullptr); if(m_interfaceOut == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
// set callback mode ... // set callback mode ...
m_interfaceOut->setOutputCallback(std11::bind(&TestClass::onDataNeeded, m_interfaceOut->setOutputCallback(std11::bind(&TestClass::onDataNeeded,
this, this,
@ -66,7 +69,10 @@ namespace river_test_echo_delay {
channelMap, channelMap,
audio::format_int16, audio::format_int16,
"microphone"); "microphone");
EXPECT_NE(m_interfaceIn, nullptr); if(m_interfaceIn == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
// set callback mode ... // set callback mode ...
m_interfaceIn->setInputCallback(std11::bind(&TestClass::onDataReceived, m_interfaceIn->setInputCallback(std11::bind(&TestClass::onDataReceived,
this, this,
@ -81,7 +87,10 @@ namespace river_test_echo_delay {
channelMap, channelMap,
audio::format_int16, audio::format_int16,
"speaker"); "speaker");
EXPECT_NE(m_interfaceFB, nullptr); if(m_interfaceFB == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
// set callback mode ... // set callback mode ...
m_interfaceFB->setInputCallback(std11::bind(&TestClass::onDataReceivedFeedBack, m_interfaceFB->setInputCallback(std11::bind(&TestClass::onDataReceivedFeedBack,
this, this,
@ -340,6 +349,18 @@ namespace river_test_echo_delay {
} }
} }
void run() { void run() {
if(m_interfaceIn == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
if(m_interfaceOut == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
if(m_interfaceFB == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
m_interfaceOut->start(); m_interfaceOut->start();
m_interfaceIn->start(); m_interfaceIn->start();
//m_interfaceFB->start(); //m_interfaceFB->start();

21
test/testFormat.h
View File

@ -66,7 +66,10 @@ namespace river_test_format {
_format, _format,
"speaker", "speaker",
"WriteModeCallbackType"); "WriteModeCallbackType");
EXPECT_NE(m_interface, nullptr); if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
// set callback mode ... // set callback mode ...
m_interface->setOutputCallback(std11::bind(&testOutCallbackType::onDataNeeded, m_interface->setOutputCallback(std11::bind(&testOutCallbackType::onDataNeeded,
this, this,
@ -132,15 +135,15 @@ namespace river_test_format {
} }
} }
void run() { void run() {
if (m_interface != nullptr) { if(m_interface == nullptr) {
m_interface->start(); APPL_ERROR("nullptr interface");
// wait 2 second ... return;
usleep(1000000);
m_interface->stop();
usleep(100000);
} else {
APPL_ERROR("Can not create interface !!!");
} }
m_interface->start();
// wait 2 second ...
usleep(1000000);
m_interface->stop();
usleep(100000);
} }
}; };

18
test/testMuxer.h
View File

@ -30,7 +30,10 @@ namespace river_test_muxer {
channelMap, channelMap,
audio::format_int16, audio::format_int16,
"speaker"); "speaker");
EXPECT_NE(m_interfaceOut, nullptr); if(m_interfaceOut == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
// set callback mode ... // set callback mode ...
m_interfaceOut->setOutputCallback(std11::bind(&TestClass::onDataNeeded, m_interfaceOut->setOutputCallback(std11::bind(&TestClass::onDataNeeded,
this, this,
@ -48,7 +51,10 @@ namespace river_test_muxer {
std::vector<audio::channel>(), std::vector<audio::channel>(),
audio::format_int16, audio::format_int16,
"microphone-muxed"); "microphone-muxed");
EXPECT_NE(m_interfaceIn, nullptr); if(m_interfaceIn == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
// set callback mode ... // set callback mode ...
m_interfaceIn->setInputCallback(std11::bind(&TestClass::onDataReceived, m_interfaceIn->setInputCallback(std11::bind(&TestClass::onDataReceived,
this, this,
@ -92,6 +98,14 @@ namespace river_test_muxer {
APPL_ERROR("Receive data ... " << _nbChunk << " map=" << _map); APPL_ERROR("Receive data ... " << _nbChunk << " map=" << _map);
} }
void run() { void run() {
if(m_interfaceIn == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
if(m_interfaceOut == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
m_interfaceOut->start(); m_interfaceOut->start();
m_interfaceIn->start(); m_interfaceIn->start();
usleep(10000000); usleep(10000000);

10
test/testPlaybackCallback.h
View File

@ -29,7 +29,10 @@ namespace river_test_playback_callback {
channelMap, channelMap,
audio::format_int16, audio::format_int16,
_io); _io);
ASSERT_NE(m_interface, nullptr); if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
// set callback mode ... // set callback mode ...
m_interface->setOutputCallback(std11::bind(&testOutCallback::onDataNeeded, m_interface->setOutputCallback(std11::bind(&testOutCallback::onDataNeeded,
this, this,
@ -62,7 +65,10 @@ namespace river_test_playback_callback {
} }
} }
void run() { void run() {
ASSERT_NE(m_interface, nullptr); if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
m_interface->start(); m_interface->start();
// wait 2 second ... // wait 2 second ...
usleep(2000000); usleep(2000000);

21
test/testPlaybackWrite.h
View File

@ -28,7 +28,7 @@ namespace river_test_playback_write {
"}\n"; "}\n";
class testOutWrite { class testOutWrite {
private: public:
std::vector<audio::channel> m_channelMap; std::vector<audio::channel> m_channelMap;
std11::shared_ptr<river::Manager> m_manager; std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interface; std11::shared_ptr<river::Interface> m_interface;
@ -42,10 +42,17 @@ namespace river_test_playback_write {
m_channelMap, m_channelMap,
audio::format_int16, audio::format_int16,
"speaker"); "speaker");
EXPECT_NE(m_interface, nullptr); if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
m_interface->setReadwrite(); m_interface->setReadwrite();
} }
void run() { void run() {
if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
double phase=0; double phase=0;
std::vector<int16_t> data; std::vector<int16_t> data;
data.resize(1024*m_channelMap.size()); data.resize(1024*m_channelMap.size());
@ -96,7 +103,7 @@ namespace river_test_playback_write {
} }
class testOutWriteCallback { class testOutWriteCallback {
private: public:
std11::shared_ptr<river::Manager> m_manager; std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interface; std11::shared_ptr<river::Interface> m_interface;
double m_phase; double m_phase;
@ -112,6 +119,10 @@ namespace river_test_playback_write {
channelMap, channelMap,
audio::format_int16, audio::format_int16,
"speaker"); "speaker");
if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
m_interface->setReadwrite(); m_interface->setReadwrite();
m_interface->setWriteCallback(std11::bind(&testOutWriteCallback::onDataNeeded, m_interface->setWriteCallback(std11::bind(&testOutWriteCallback::onDataNeeded,
this, this,
@ -145,6 +156,10 @@ namespace river_test_playback_write {
m_interface->write(&data[0], data.size()/_map.size()); m_interface->write(&data[0], data.size()/_map.size());
} }
void run() { void run() {
if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
m_interface->start(); m_interface->start();
usleep(1000000); usleep(1000000);
m_interface->stop(); m_interface->stop();

11
test/testRecordCallback.h
View File

@ -29,7 +29,7 @@ namespace river_test_record_callback {
"}\n"; "}\n";
class testInCallback { class testInCallback {
private: public:
std11::shared_ptr<river::Manager> m_manager; std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interface; std11::shared_ptr<river::Interface> m_interface;
public: public:
@ -41,7 +41,10 @@ namespace river_test_record_callback {
channelMap, channelMap,
audio::format_int16, audio::format_int16,
_input); _input);
EXPECT_NE(m_interface, nullptr); if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
// set callback mode ... // set callback mode ...
m_interface->setInputCallback(std11::bind(&testInCallback::onDataReceived, m_interface->setInputCallback(std11::bind(&testInCallback::onDataReceived,
this, this,
@ -71,6 +74,10 @@ namespace river_test_record_callback {
APPL_INFO("Get data ... average=" << int32_t(value)); APPL_INFO("Get data ... average=" << int32_t(value));
} }
void run() { void run() {
if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
m_interface->start(); m_interface->start();
// wait 2 second ... // wait 2 second ...
usleep(20000000); usleep(20000000);

9
test/testVolume.h
View File

@ -44,7 +44,10 @@ namespace river_test_volume {
channelMap, channelMap,
audio::format_int16, audio::format_int16,
"speaker"); "speaker");
EXPECT_NE(m_interface, nullptr); if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
// set callback mode ... // set callback mode ...
m_interface->setOutputCallback(std11::bind(&testCallbackVolume::onDataNeeded, m_interface->setOutputCallback(std11::bind(&testCallbackVolume::onDataNeeded,
this, this,
@ -76,6 +79,10 @@ namespace river_test_volume {
} }
} }
void run() { void run() {
if(m_interface == nullptr) {
APPL_ERROR("nullptr interface");
return;
}
m_interface->start(); m_interface->start();
usleep(1000000); usleep(1000000);
m_interface->setParameter("volume", "FLOW", "-3dB"); m_interface->setParameter("volume", "FLOW", "-3dB");