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

Compare commits

merge into: musicdsp:main
Branches Tags
musicdsp:main
musicdsp:dev
musicdsp:gh-pages
musicdsp:v1.0.0
musicdsp:0.3.0
musicdsp:0.2.1
musicdsp:0.1.0
...
pull from: musicdsp:dev
Branches Tags
musicdsp:dev
musicdsp:main
musicdsp:gh-pages
musicdsp:v1.0.0
musicdsp:0.3.0
musicdsp:0.2.1
musicdsp:0.1.0

2 Commits
main ... dev

Author SHA1 Message Date
Edouard DUPIN
678896678b [DEV] integrate GLD 2021-12-15 22:43:03 +01:00
Edouard DUPIN
e7b45bd027 [VERSION] update dev tag version 2021-02-16 21:47:39 +01:00
13 changed files with 207 additions and 265 deletions
Show Stats Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,3 +1,8 @@
__pycache__
.bck
out
target
build
###################################
# backup files
###################################

30
GLD_audio-drain-test.json Normal file
View File

@ -0,0 +1,30 @@
{
"type":"BINARY",
"sub-type":"TEST",
"group-id":"com.atria-soft",
"description":"single audio flow test",
"license":"MPL-2",
"license-file":"file://LICENSE",
"maintainer":"file://authors.txt",
"author":"file://authors.txt",
"version":"file://version.txt",
"code-quality":"MEDIUM",
"source": [
"test/main.cpp",
"test/updateFlow.cpp",
"test/resampling.cpp",
"test/format.cpp",
"test/channelOrder.cpp",
"test/equalizer.cpp"
],
"compilation-version": {
"c++": 2017
},
"dependency": [
"audio-drain",
"etest",
"etk",
"test-debug"
]
}

70
GLD_audio-drain.json Normal file
View File

@ -0,0 +1,70 @@
{
"type":"LIBRARY",
"group-id":"com.atria-soft",
"description":"Basic audio algo interface single pipe to provess data",
"license":"MPL-2",
"license-file":"file://LICENSE",
"maintainer":"file://authors.txt",
"author":"file://authors.txt",
"version":"file://version.txt",
"code-quality":"MEDIUM",
"source": [
"audio/drain/debug.cpp",
"audio/drain/airtalgo.cpp",
"audio/drain/Algo.cpp",
"audio/drain/ChannelReorder.cpp",
"audio/drain/CircularBuffer.cpp",
"audio/drain/EndPointCallback.cpp",
"audio/drain/EndPoint.cpp",
"audio/drain/EndPointRead.cpp",
"audio/drain/EndPointWrite.cpp",
"audio/drain/FormatUpdate.cpp",
"audio/drain/Process.cpp",
"audio/drain/Resampler.cpp",
"audio/drain/Volume.cpp",
"audio/drain/IOFormatInterface.cpp",
"audio/drain/AutoLogInOut.cpp",
"audio/drain/Equalizer.cpp"
],
"header": [
"audio/drain/debug.hpp",
"audio/drain/debugRemove.hpp",
"audio/drain/airtalgo.hpp",
"audio/drain/Algo.hpp",
"audio/drain/ChannelReorder.hpp",
"audio/drain/CircularBuffer.hpp",
"audio/drain/EndPointCallback.hpp",
"audio/drain/EndPoint.hpp",
"audio/drain/EndPointRead.hpp",
"audio/drain/EndPointWrite.hpp",
"audio/drain/FormatUpdate.hpp",
"audio/drain/Process.hpp",
"audio/drain/Resampler.hpp",
"audio/drain/Volume.hpp",
"audio/drain/IOFormatInterface.hpp",
"audio/drain/AutoLogInOut.hpp",
"audio/drain/Equalizer.hpp"
],
"path":[
"."
],
"compilation-version": {
"c++": 2017
},
"dependency": [
"etk",
"audio",
"ejson",
"speex-dsp",
"audio-algo-drain",
{
"name": "speex-dsp",
"optional": true,
"export": true,
"flag": {
"c++": "-DHAVE_SPEEX_DSP_RESAMPLE"
}
}
]
}

51
lutin_audio-drain-test.py
View File

@ -1,51 +0,0 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.tools as tools
def get_type():
return "BINARY"
def get_sub_type():
return "TEST"
def get_desc():
return "single audio flow test"
def get_licence():
return "MPL-2"
def get_compagny_type():
return "com"
def get_compagny_name():
return "atria-soft"
def get_maintainer():
return "authors.txt"
def configure(target, my_module):
my_module.add_src_file([
'test/main.cpp',
'test/updateFlow.cpp',
'test/resampling.cpp',
'test/format.cpp',
'test/channelOrder.cpp',
'test/equalizer.cpp'
])
my_module.add_depend([
'audio-drain',
'etest',
'etk',
'test-debug'
])
return True

87
lutin_audio-drain.py
View File

@ -1,87 +0,0 @@
#!/usr/bin/python
import lutin.tools as tools
import realog.debug as debug
def get_type():
return "LIBRARY"
def get_desc():
return "Basic audio algo interface single pipe to provess data"
def get_licence():
return "MPL-2"
def get_compagny_type():
return "com"
def get_compagny_name():
return "atria-soft"
def get_maintainer():
return "authors.txt"
def get_version():
return "version.txt"
def configure(target, my_module):
my_module.add_src_file([
'audio/drain/debug.cpp',
'audio/drain/airtalgo.cpp',
'audio/drain/Algo.cpp',
'audio/drain/ChannelReorder.cpp',
'audio/drain/CircularBuffer.cpp',
'audio/drain/EndPointCallback.cpp',
'audio/drain/EndPoint.cpp',
'audio/drain/EndPointRead.cpp',
'audio/drain/EndPointWrite.cpp',
'audio/drain/FormatUpdate.cpp',
'audio/drain/Process.cpp',
'audio/drain/Resampler.cpp',
'audio/drain/Volume.cpp',
'audio/drain/IOFormatInterface.cpp',
'audio/drain/AutoLogInOut.cpp',
'audio/drain/Equalizer.cpp'
])
my_module.add_header_file([
'audio/drain/debug.hpp',
'audio/drain/debugRemove.hpp',
'audio/drain/airtalgo.hpp',
'audio/drain/Algo.hpp',
'audio/drain/ChannelReorder.hpp',
'audio/drain/CircularBuffer.hpp',
'audio/drain/EndPointCallback.hpp',
'audio/drain/EndPoint.hpp',
'audio/drain/EndPointRead.hpp',
'audio/drain/EndPointWrite.hpp',
'audio/drain/FormatUpdate.hpp',
'audio/drain/Process.hpp',
'audio/drain/Resampler.hpp',
'audio/drain/Volume.hpp',
'audio/drain/IOFormatInterface.hpp',
'audio/drain/AutoLogInOut.hpp',
'audio/drain/Equalizer.hpp'
])
# TODO: my_module.add_optional_module_depend('speexdsp', "HAVE_SPEEX_DSP_RESAMPLE")
my_module.add_flag('c++', "-DHAVE_SPEEX_DSP_RESAMPLE")
my_module.add_depend([
'etk',
'audio',
'ejson',
'speex-dsp',
'audio-algo-drain'
])
my_module.add_path(".")
return True

35
tools/drainBiQuadProfiling/GLD_drain_biquad_profiling.json Normal file
View File

@ -0,0 +1,35 @@
{
"type": "BINARY",
"sub-type": "TOOL",
"group-id": "com.atria-soft",
"description": "basic test and profiling of equalizer work or not",
"license": "MPL-2",
"license-file": "file://../../../LICENSE",
"maintainer": "file://../../../authors.txt",
"author": "file://../../../authors.txt",
"version": "file://../../../version.txt",
"code-quality": "MEDIUM",
"source": [
"appl/main.cpp",
"appl/debug.cpp",
"appl/Windows.cpp",
"appl/widget/DisplayFrequency.cpp"
],
"dependency": [
"ewol",
"audio-drain",
"audio-river"
],
"path": [
"."
],
"flag": {
"c++": "-DPROJECT_NAME=\"\\\"{{{project.name}}}\\\"\""
},
"copy": [
{
"path": "data/*"
}
]
}

43
tools/drainBiQuadProfiling/appl/Windows.cpp
View File

@ -14,7 +14,7 @@
#include <ewol/widget/Slider.hpp>
#include <audio/drain/Equalizer.hpp>
define APPL_SAVE_FILE_MACRO(type,fileName,dataPointer,nbElement) \
#define APPL_SAVE_FILE_MACRO(type,fileName,dataPointer,nbElement) \
do { \
static FILE *pointerOnFile = null; \
static bool errorOpen = false; \
@ -64,9 +64,10 @@ appl::Windows::Windows() :
void appl::Windows::init() {
ewol::widget::Windows::init();
setTitle("Drain Equalizer Profiler");
//setTitle("Drain Equalizer Profiler");
m_gui = ewol::widget::Composer::create(ewol::widget::Composer::file, "DATA:///gui.xml");
m_gui = ewol::widget::Composer::create();
m_gui->loadFromFile(etk::Uri("DATA:///gui.xml"));
if (m_gui != null) {
setSubWidget(m_gui);
}
@ -100,15 +101,15 @@ void appl::Windows::onCallbackSampleRateUp() {
} else {
m_sampleRate = m_listSampleRate[0];
}
ewol::parameterSetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::parameterSetOnObjectNamed("frequency-slider", "max", etk::toString(m_sampleRate/2));
ewol::propertySetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::propertySetOnObjectNamed("frequency-slider", "max", etk::toString(m_sampleRate/2));
onCallbackStart();
return;
}
}
m_sampleRate = m_listSampleRate[0];
ewol::parameterSetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::parameterSetOnObjectNamed("frequency-slider", "max", etk::toString(m_sampleRate/2));
ewol::propertySetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::propertySetOnObjectNamed("frequency-slider", "max", etk::toString(m_sampleRate/2));
onCallbackStart();
}
@ -121,15 +122,15 @@ void appl::Windows::onCallbackSampleRateLow() {
} else {
m_sampleRate = m_listSampleRate[m_listSampleRate.size()-1];
}
ewol::parameterSetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::parameterSetOnObjectNamed("frequency-slider", "max", etk::toString(m_sampleRate/2));
ewol::propertySetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::propertySetOnObjectNamed("frequency-slider", "max", etk::toString(m_sampleRate/2));
onCallbackStart();
return;
}
}
m_sampleRate = m_listSampleRate[0];
ewol::parameterSetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::parameterSetOnObjectNamed("frequency-slider", "max", etk::toString(m_sampleRate/2));
ewol::propertySetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::propertySetOnObjectNamed("frequency-slider", "max", etk::toString(m_sampleRate/2));
onCallbackStart();
}
@ -142,13 +143,13 @@ void appl::Windows::onCallbackTypeUp() {
} else {
m_type = m_listType[0];
}
ewol::parameterSetOnObjectNamed("type", "value", etk::toString(m_type));
ewol::propertySetOnObjectNamed("type", "value", etk::toString(m_type));
onCallbackStart();
return;
}
}
m_type = m_listType[0];
ewol::parameterSetOnObjectNamed("type", "value", etk::toString(m_type));
ewol::propertySetOnObjectNamed("type", "value", etk::toString(m_type));
onCallbackStart();
}
@ -161,27 +162,27 @@ void appl::Windows::onCallbackTypeLow() {
} else {
m_type = m_listType[m_listType.size()-1];
}
ewol::parameterSetOnObjectNamed("type", "value", etk::toString(m_type));
ewol::propertySetOnObjectNamed("type", "value", etk::toString(m_type));
onCallbackStart();
return;
}
}
m_type = m_listType[0];
ewol::parameterSetOnObjectNamed("type", "value", etk::toString(m_type));
ewol::propertySetOnObjectNamed("type", "value", etk::toString(m_type));
onCallbackStart();
}
void appl::Windows::onCallbackGain(const etk::String& _value) {
m_gain = etk::string_to_float(_value);
ewol::parameterSetOnObjectNamed("gain-slider", "value", etk::toString(_value));
ewol::propertySetOnObjectNamed("gain-slider", "value", etk::toString(_value));
APPL_INFO("Gain " << m_gain);
onCallbackStart();
}
void appl::Windows::onCallbackGainSlider(const float& _value) {
m_gain = _value;
ewol::parameterSetOnObjectNamed("gain", "value", etk::toString(_value));
ewol::propertySetOnObjectNamed("gain", "value", etk::toString(_value));
APPL_INFO("Gain " << m_gain);
onCallbackStart();
}
@ -190,14 +191,14 @@ void appl::Windows::onCallbackGainSlider(const float& _value) {
void appl::Windows::onCallbackQuality(const etk::String& _value) {
m_quality = etk::string_to_float(_value);
ewol::parameterSetOnObjectNamed("quality-slider", "value", etk::toString(_value));
ewol::propertySetOnObjectNamed("quality-slider", "value", etk::toString(_value));
APPL_INFO("quality " << m_quality);
onCallbackStart();
}
void appl::Windows::onCallbackQualitySlider(const float& _value) {
m_quality = _value;
ewol::parameterSetOnObjectNamed("quality", "value", etk::toString(_value));
ewol::propertySetOnObjectNamed("quality", "value", etk::toString(_value));
APPL_INFO("quality " << m_quality);
onCallbackStart();
}
@ -205,14 +206,14 @@ void appl::Windows::onCallbackQualitySlider(const float& _value) {
void appl::Windows::onCallbackFrequency(const etk::String& _value) {
m_cutFrequency = etk::string_to_float(_value);
ewol::parameterSetOnObjectNamed("frequency-slider", "value", etk::toString(_value));
ewol::propertySetOnObjectNamed("frequency-slider", "value", etk::toString(_value));
APPL_INFO("cut frequency " << m_cutFrequency);
onCallbackStart();
}
void appl::Windows::onCallbackFrequencySlider(const float& _value) {
m_cutFrequency = _value;
ewol::parameterSetOnObjectNamed("frequency", "value", etk::toString(_value));
ewol::propertySetOnObjectNamed("frequency", "value", etk::toString(_value));
APPL_INFO("cut frequency " << m_cutFrequency);
onCallbackStart();
}

48
tools/drainBiQuadProfiling/lutin_drain_biquad_profiling.py
View File

@ -1,48 +0,0 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.tools as tools
def get_type():
return "BINARY"
def get_sub_type():
return "TOOLS"
def get_desc():
return "basic test and profiling of equalizer work or not"
def get_licence():
return "MPL-2"
def get_compagny_type():
return "com"
def get_compagny_name():
return "atria-soft"
def get_maintainer():
return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
def configure(target, my_module):
my_module.add_src_file([
'appl/main.cpp',
'appl/debug.cpp',
'appl/Windows.cpp',
'appl/widget/DisplayFrequency.cpp',
])
my_module.add_depend([
'ewol',
'audio-drain',
'audio-river'
])
my_module.add_flag('c++', [
"-DPROJECT_NAME=\"\\\""+my_module.get_name()+"\\\"\""
])
my_module.add_path(".")
my_module.copy_path("data/*")
return True

35
tools/drainEqualizerProfiling/GLD_drain_equalizer_profiling.json Normal file
View File

@ -0,0 +1,35 @@
{
"type": "BINARY",
"sub-type": "TOOL",
"group-id": "com.atria-soft",
"description": "basic test and profiling of equalizer work or not",
"license": "MPL-2",
"license-file": "file://../../../LICENSE",
"maintainer": "file://../../../authors.txt",
"author": "file://../../../authors.txt",
"version": "file://../../../version.txt",
"code-quality": "MEDIUM",
"source": [
"appl/main.cpp",
"appl/debug.cpp",
"appl/Windows.cpp",
"appl/widget/DisplayFrequency.cpp"
],
"dependency": [
"ewol",
"audio-drain",
"audio-river"
],
"path": [
"."
],
"flag": {
"c++": "-DPROJECT_NAME=\"\\\"{{{project.name}}}\\\"\""
},
"copy": [
{
"path": "data/*"
}
]
}

14
tools/drainEqualizerProfiling/appl/Windows.cpp
View File

@ -51,9 +51,9 @@ appl::Windows::Windows() :
void appl::Windows::init() {
ewol::widget::Windows::init();
setTitle("Drain Equalizer Profiler");
m_gui = ewol::widget::Composer::create(ewol::widget::Composer::file, "DATA:///gui.xml");
//setTitle("Drain Equalizer Profiler");
m_gui = ewol::widget::Composer::create();
m_gui->loadFromFile(etk::Uri("DATA:///gui.xml"));
if (m_gui != null) {
setSubWidget(m_gui);
}
@ -87,13 +87,13 @@ void appl::Windows::onCallbackSampleRateUp() {
} else {
m_sampleRate = m_listSampleRate[0];
}
ewol::parameterSetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::propertySetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
onCallbackStart();
return;
}
}
m_sampleRate = m_listSampleRate[0];
ewol::parameterSetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::propertySetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
onCallbackStart();
}
@ -106,13 +106,13 @@ void appl::Windows::onCallbackSampleRateLow() {
} else {
m_sampleRate = m_listSampleRate[m_listSampleRate.size()-1];
}
ewol::parameterSetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::propertySetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
onCallbackStart();
return;
}
}
m_sampleRate = m_listSampleRate[0];
ewol::parameterSetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
ewol::propertySetOnObjectNamed("sample-rate", "value", etk::toString(m_sampleRate));
onCallbackStart();
}

4
tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp
View File

@ -89,12 +89,12 @@ void appl::widget::DisplayFrequency::onRegenerateDisplay() {
//APPL_INFO("plop " << m_data[kkk][iii].second);
}
if (displayLog == false) {
if (isinf(etk::abs(m_data[kkk][iii].first)) == false) {
if ( !isinf(etk::abs(m_data[kkk][iii].first))) {
m_frequencyMax = etk::max(m_frequencyMax, m_data[kkk][iii].first);
m_frequencyMin = etk::min(m_frequencyMin, m_data[kkk][iii].first);
}
} else {
if (isinf(etk::abs(m_data[kkk][iii].first))) == false) {
if ( !isinf(etk::abs(m_data[kkk][iii].first))) {
if (m_data[kkk][iii].first == 0) {
continue;
}

48
tools/drainEqualizerProfiling/lutin_drain_equalizer_profiling.py
View File

@ -1,48 +0,0 @@
#!/usr/bin/python
import realog.debug as debug
import lutin.tools as tools
def get_type():
return "BINARY"
def get_sub_type():
return "TOOLS"
def get_desc():
return "basic test and profiling of equalizer work or not"
def get_licence():
return "MPL-2"
def get_compagny_type():
return "com"
def get_compagny_name():
return "atria-soft"
def get_maintainer():
return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
def configure(target, my_module):
my_module.add_src_file([
'appl/main.cpp',
'appl/debug.cpp',
'appl/Windows.cpp',
'appl/widget/DisplayFrequency.cpp',
])
my_module.add_depend([
'ewol',
'audio-drain',
'audio-river'
])
my_module.add_flag('c++', [
"-DPROJECT_NAME=\"\\\""+my_module.get_name()+"\\\"\""
])
my_module.add_path(".")
my_module.copy_path("data/*")
return True

2
version.txt
View File

@ -1 +1 @@
1.0.0
1.0.0-dev