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

[DEV] rename lib river in audio::river

Browse Source
This commit is contained in:
Edouard DUPIN
2015-04-11 09:38:30 +02:00
parent bf05f46f24
commit 26e71b2a92
46 changed files with 1806 additions and 1799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/main.cpp
View File

@@ -5,9 +5,9 @@
*/
#include "debug.h"
#include <river/river.h>
#include <river/Manager.h>
#include <river/Interface.h>
#include <audio/river/river.h>
#include <audio/river/Manager.h>
#include <audio/river/Interface.h>
#include <gtest/gtest.h>
#include <etk/etk.h>
#include <etk/os/FSNode.h>
@@ -29,7 +29,7 @@
#undef __class__
#define __class__ "test"
int main(int _argc, char** _argv) {
int main(int _argc, const char** _argv) {
// init Google test :
::testing::InitGoogleTest(&_argc, const_cast<char **>(_argv));
// the only one init for etk:

18
test/testAEC.h
View File

@@ -14,12 +14,12 @@ namespace river_test_aec {
class Linker {
private:
std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interfaceOut;
std11::shared_ptr<river::Interface> m_interfaceIn;
drain::CircularBuffer m_buffer;
std11::shared_ptr<audio::river::Manager> m_manager;
std11::shared_ptr<audio::river::Interface> m_interfaceOut;
std11::shared_ptr<audio::river::Interface> m_interfaceIn;
audio::drain::CircularBuffer m_buffer;
public:
Linker(std11::shared_ptr<river::Manager> _manager, const std::string& _input, const std::string& _output) :
Linker(std11::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;
@@ -199,9 +199,9 @@ namespace river_test_aec {
"}\n";
TEST(TestUser, testAECManually) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::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");
processLink1->start();
@@ -213,7 +213,7 @@ namespace river_test_aec {
processLink1.reset();
processLink2.reset();
manager.reset();
river::unInit();
audio::river::unInit();
}
};

20
test/testEchoDelay.h
View File

@@ -7,7 +7,7 @@
#ifndef __RIVER_TEST_ECHO_DELAY_H__
#define __RIVER_TEST_ECHO_DELAY_H__
#include <river/debug.h>
#include <audio/river/debug.h>
#undef __class__
#define __class__ "test_echo_delay"
@@ -15,10 +15,10 @@
namespace river_test_echo_delay {
class TestClass {
private:
std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interfaceOut;
std11::shared_ptr<river::Interface> m_interfaceIn;
std11::shared_ptr<river::Interface> m_interfaceFB;
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;
double m_phase;
double m_freq;
int32_t m_nextSampleCount;
@@ -33,7 +33,7 @@ namespace river_test_echo_delay {
int16_t m_volumeInputMin;
float m_gain;
public:
TestClass(std11::shared_ptr<river::Manager> _manager) :
TestClass(std11::shared_ptr<audio::river::Manager> _manager) :
m_manager(_manager),
m_phase(0),
m_freq(400),
@@ -417,14 +417,14 @@ namespace river_test_echo_delay {
"}\n";
TEST(TestTime, testDelay) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
std11::shared_ptr<TestClass> process = std11::make_shared<TestClass>(manager);
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
};

38
test/testFormat.h
View File

@@ -28,15 +28,15 @@ namespace river_test_format {
"}\n";
class testOutCallbackType {
private:
std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interface;
std11::shared_ptr<audio::river::Manager> m_manager;
std11::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<river::Manager>& _manager,
testOutCallbackType(const std11::shared_ptr<audio::river::Manager>& _manager,
float _freq=48000.0f,
int32_t _nbChannels=2,
audio::format _format=audio::format_int16) :
@@ -150,14 +150,14 @@ namespace river_test_format {
class testResampling : public ::testing::TestWithParam<float> {};
TEST_P(testResampling, base) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::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);
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
INSTANTIATE_TEST_CASE_P(InstantiationName,
@@ -167,14 +167,14 @@ namespace river_test_format {
class testFormat : public ::testing::TestWithParam<audio::format> {};
TEST_P(testFormat, base) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::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());
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
INSTANTIATE_TEST_CASE_P(InstantiationName,
testFormat,
@@ -183,14 +183,14 @@ namespace river_test_format {
class testChannels : public ::testing::TestWithParam<int32_t> {};
TEST_P(testChannels, base) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::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);
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
INSTANTIATE_TEST_CASE_P(InstantiationName,
testChannels,
@@ -198,9 +198,9 @@ namespace river_test_format {
TEST(TestALL, testChannelsFormatResampling) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
APPL_INFO("test convert flaot to output (callback mode)");
std::vector<float> listFreq;
listFreq.push_back(4000);
@@ -235,7 +235,7 @@ namespace river_test_format {
}
}
}
river::unInit();
audio::river::unInit();
}

18
test/testMuxer.h
View File

@@ -7,7 +7,7 @@
#ifndef __RIVER_TEST_MUXER_H__
#define __RIVER_TEST_MUXER_H__
#include <river/debug.h>
#include <audio/river/debug.h>
#undef __class__
#define __class__ "test_muxer"
@@ -15,12 +15,12 @@
namespace river_test_muxer {
class TestClass {
private:
std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interfaceIn;
std11::shared_ptr<river::Interface> m_interfaceOut;
std11::shared_ptr<audio::river::Manager> m_manager;
std11::shared_ptr<audio::river::Interface> m_interfaceIn;
std11::shared_ptr<audio::river::Interface> m_interfaceOut;
double m_phase;
public:
TestClass(std11::shared_ptr<river::Manager> _manager) :
TestClass(std11::shared_ptr<audio::river::Manager> _manager) :
m_manager(_manager),
m_phase(0) {
std::vector<audio::channel> channelMap;
@@ -167,14 +167,14 @@ namespace river_test_muxer {
"}\n";
TEST(TestMuxer, testMuxing) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
std11::shared_ptr<TestClass> process = std11::make_shared<TestClass>(manager);
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
};

30
test/testPlaybackCallback.h
View File

@@ -14,11 +14,11 @@ namespace river_test_playback_callback {
class testOutCallback {
public:
std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interface;
std11::shared_ptr<audio::river::Manager> m_manager;
std11::shared_ptr<audio::river::Interface> m_interface;
double m_phase;
public:
testOutCallback(std11::shared_ptr<river::Manager> _manager, const std::string& _io="speaker") :
testOutCallback(std11::shared_ptr<audio::river::Manager> _manager, const std::string& _io="speaker") :
m_manager(_manager),
m_phase(0) {
//Set stereo output:
@@ -93,9 +93,9 @@ namespace river_test_playback_callback {
"}\n";
TEST(TestALL, testOutputCallBack) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
APPL_INFO("test output (callback mode)");
std11::shared_ptr<testOutCallback> process = std11::make_shared<testOutCallback>(manager, "speaker");
@@ -103,33 +103,33 @@ namespace river_test_playback_callback {
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
TEST(TestALL, testOutputCallBackPulse) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
APPL_INFO("test output (callback mode)");
std11::shared_ptr<testOutCallback> process = std11::make_shared<testOutCallback>(manager, "speaker-pulse");
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
TEST(TestALL, testOutputCallBackJack) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
APPL_INFO("test output (callback mode)");
std11::shared_ptr<testOutCallback> process = std11::make_shared<testOutCallback>(manager, "speaker-jack");
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}

28
test/testPlaybackWrite.h
View File

@@ -30,10 +30,10 @@ namespace river_test_playback_write {
class testOutWrite {
public:
std::vector<audio::channel> m_channelMap;
std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interface;
std11::shared_ptr<audio::river::Manager> m_manager;
std11::shared_ptr<audio::river::Interface> m_interface;
public:
testOutWrite(std11::shared_ptr<river::Manager> _manager) :
testOutWrite(std11::shared_ptr<audio::river::Manager> _manager) :
m_manager(_manager) {
//Set stereo output:
m_channelMap.push_back(audio::channel_frontLeft);
@@ -90,25 +90,25 @@ namespace river_test_playback_write {
};
TEST(TestALL, testOutputWrite) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
APPL_INFO("test output (write mode)");
std11::shared_ptr<testOutWrite> process = std11::make_shared<testOutWrite>(manager);
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
class testOutWriteCallback {
public:
std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interface;
std11::shared_ptr<audio::river::Manager> m_manager;
std11::shared_ptr<audio::river::Interface> m_interface;
double m_phase;
public:
testOutWriteCallback(std11::shared_ptr<river::Manager> _manager) :
testOutWriteCallback(std11::shared_ptr<audio::river::Manager> _manager) :
m_manager(_manager),
m_phase(0) {
std::vector<audio::channel> channelMap;
@@ -167,16 +167,16 @@ namespace river_test_playback_write {
};
TEST(TestALL, testOutputWriteWithCallback) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
APPL_INFO("test output (write with callback event mode)");
std11::shared_ptr<testOutWriteCallback> process = std11::make_shared<testOutWriteCallback>(manager);
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
};

16
test/testRecordCallback.h
View File

@@ -7,7 +7,7 @@
#ifndef __RIVER_TEST_RECORD_CALLBACK_H__
#define __RIVER_TEST_RECORD_CALLBACK_H__
#include <river/debug.h>
#include <audio/river/debug.h>
#undef __class__
#define __class__ "test_record_callback"
@@ -30,10 +30,10 @@ namespace river_test_record_callback {
class testInCallback {
public:
std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interface;
std11::shared_ptr<audio::river::Manager> m_manager;
std11::shared_ptr<audio::river::Interface> m_interface;
public:
testInCallback(std11::shared_ptr<river::Manager> _manager, const std::string& _input="microphone") :
testInCallback(std11::shared_ptr<audio::river::Manager> _manager, const std::string& _input="microphone") :
m_manager(_manager) {
//Set stereo output:
std::vector<audio::channel> channelMap;
@@ -86,15 +86,15 @@ namespace river_test_record_callback {
};
TEST(TestALL, testInputCallBack) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
APPL_INFO("test input (callback mode)");
std11::shared_ptr<testInCallback> process = std11::make_shared<testInCallback>(manager);
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
};

14
test/testVolume.h
View File

@@ -29,11 +29,11 @@ namespace river_test_volume {
class testCallbackVolume {
private:
std11::shared_ptr<river::Manager> m_manager;
std11::shared_ptr<river::Interface> m_interface;
std11::shared_ptr<audio::river::Manager> m_manager;
std11::shared_ptr<audio::river::Interface> m_interface;
double m_phase;
public:
testCallbackVolume(std11::shared_ptr<river::Manager> _manager) :
testCallbackVolume(std11::shared_ptr<audio::river::Manager> _manager) :
m_manager(_manager),
m_phase(0) {
//Set stereo output:
@@ -123,14 +123,14 @@ namespace river_test_volume {
};
TEST(TestALL, testVolume) {
river::initString(configurationRiver);
std11::shared_ptr<river::Manager> manager;
manager = river::Manager::create("testApplication");
audio::river::initString(configurationRiver);
std11::shared_ptr<audio::river::Manager> manager;
manager = audio::river::Manager::create("testApplication");
std11::shared_ptr<testCallbackVolume> process = std11::make_shared<testCallbackVolume>(manager);
process->run();
process.reset();
usleep(500000);
river::unInit();
audio::river::unInit();
}
};