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

Compare commits

base: musicdsp:0.1.0
Branches Tags
musicdsp:main musicdsp:dev
musicdsp:v1.0.0 musicdsp:0.2.0 musicdsp:0.1.1 musicdsp:0.1.0
...
compare: musicdsp:0.2.0
Branches Tags
musicdsp:dev musicdsp:main
musicdsp:v1.0.0 musicdsp:0.2.0 musicdsp:0.1.1 musicdsp:0.1.0

8 Commits
0.1.0 ... 0.2.0

Author SHA1 Message Date
Edouard DUPIN
7cdc3856ba [RELEASE] new version 0.2.0 2016-10-23 18:32:02 +02:00
Edouard DUPIN
9ce8a22a29 [DEV] remove dependency of unistd.h 2016-10-13 21:29:18 +02:00
Edouard DUPIN
ce5910b8df [DEV] Update new lutin 2.2.0 (no legacy support) 2016-10-04 23:41:29 +02:00
Edouard DUPIN
eae5465cd1 [DEV/API] change .h in .hpp 2016-10-02 20:42:23 +02:00
Edouard DUPIN
7d05aaf0d4 [DEV] update dev tag version 2016-09-12 21:07:12 +02:00
Edouard DUPIN
75c6cf8eff [RELEASE] create release 0.1.1 2016-09-12 21:06:37 +02:00
Edouard DUPIN
b42424d619 [DEV] update to future lutin 2.0 2016-09-07 22:05:42 +02:00
Edouard DUPIN
4d4aeb2eae [DEV] update dev tag version 2016-08-30 22:54:57 +02:00
22 changed files with 65 additions and 66 deletions
Expand all files Collapse all files

2
audio/algo/chunkware/AttRelEnvelope.cpp
View File

@@ -24,7 +24,7 @@
*/ */
#include <audio/algo/chunkware/AttRelEnvelope.h> #include <audio/algo/chunkware/AttRelEnvelope.hpp>
audio::algo::chunkware::AttRelEnvelope::AttRelEnvelope(double _attackms, double _releasems, double _sampleRate) : audio::algo::chunkware::AttRelEnvelope::AttRelEnvelope(double _attackms, double _releasems, double _sampleRate) :
m_attack(_attackms, _sampleRate), m_attack(_attackms, _sampleRate),

2
audio/algo/chunkware/AttRelEnvelope.h → audio/algo/chunkware/AttRelEnvelope.hpp
View File

@@ -24,7 +24,7 @@
*/ */
#pragma once #pragma once
#include <audio/algo/chunkware/EnvelopeDetector.h> #include <audio/algo/chunkware/EnvelopeDetector.hpp>
namespace audio { namespace audio {
namespace algo { namespace algo {

4
audio/algo/chunkware/Compressor.cpp
View File

@@ -23,8 +23,8 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <audio/algo/chunkware/Compressor.h> #include <audio/algo/chunkware/Compressor.hpp>
#include <audio/algo/chunkware/debug.h> #include <audio/algo/chunkware/debug.hpp>
#include <cmath> #include <cmath>
audio::algo::chunkware::Compressor::Compressor() : audio::algo::chunkware::Compressor::Compressor() :

8
audio/algo/chunkware/Compressor.h → audio/algo/chunkware/Compressor.hpp
View File

@@ -24,10 +24,10 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
#include <audio/format.h> #include <audio/format.hpp>
#include <audio/algo/chunkware/AttRelEnvelope.h> #include <audio/algo/chunkware/AttRelEnvelope.hpp>
#include <audio/algo/chunkware/Gain.h> #include <audio/algo/chunkware/Gain.hpp>
namespace audio { namespace audio {
namespace algo { namespace algo {

2
audio/algo/chunkware/CompressorRms.cpp
View File

@@ -24,7 +24,7 @@
*/ */
#include <audio/algo/chunkware/CompressorRms.h> #include <audio/algo/chunkware/CompressorRms.hpp>
audio::algo::chunkware::CompressorRms::CompressorRms() : audio::algo::chunkware::CompressorRms::CompressorRms() :

2
audio/algo/chunkware/CompressorRms.h → audio/algo/chunkware/CompressorRms.hpp
View File

@@ -24,7 +24,7 @@
*/ */
#pragma once #pragma once
#include <audio/algo/chunkware/Compressor.h> #include <audio/algo/chunkware/Compressor.hpp>
namespace audio { namespace audio {
namespace algo { namespace algo {

4
audio/algo/chunkware/EnvelopeDetector.cpp
View File

@@ -24,8 +24,8 @@
*/ */
#include <audio/algo/chunkware/debug.h> #include <audio/algo/chunkware/debug.hpp>
#include <audio/algo/chunkware/EnvelopeDetector.h> #include <audio/algo/chunkware/EnvelopeDetector.hpp>
audio::algo::chunkware::EnvelopeDetector::EnvelopeDetector(double _ms, double _sampleRate) { audio::algo::chunkware::EnvelopeDetector::EnvelopeDetector(double _ms, double _sampleRate) {
AA_CHUNK_ASSERT(_sampleRate > 0.0, "input function error"); AA_CHUNK_ASSERT(_sampleRate > 0.0, "input function error");

2
audio/algo/chunkware/EnvelopeDetector.h → audio/algo/chunkware/EnvelopeDetector.hpp
View File

@@ -24,7 +24,7 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
namespace audio { namespace audio {
namespace algo { namespace algo {

2
audio/algo/chunkware/Gain.h → audio/algo/chunkware/Gain.hpp
View File

@@ -24,7 +24,7 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
namespace audio { namespace audio {
namespace algo { namespace algo {

4
audio/algo/chunkware/Gate.cpp
View File

@@ -24,8 +24,8 @@
*/ */
#include <audio/algo/chunkware/Gate.h> #include <audio/algo/chunkware/Gate.hpp>
#include <audio/algo/chunkware/debug.h> #include <audio/algo/chunkware/debug.hpp>
#include <cmath> #include <cmath>
audio::algo::chunkware::Gate::Gate() : audio::algo::chunkware::Gate::Gate() :

8
audio/algo/chunkware/Gate.h → audio/algo/chunkware/Gate.hpp
View File

@@ -24,10 +24,10 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
#include <audio/algo/chunkware/AttRelEnvelope.h> #include <audio/algo/chunkware/AttRelEnvelope.hpp>
#include <audio/algo/chunkware/Gain.h> #include <audio/algo/chunkware/Gain.hpp>
#include <audio/format.h> #include <audio/format.hpp>
namespace audio { namespace audio {
namespace algo { namespace algo {

2
audio/algo/chunkware/GateRms.cpp
View File

@@ -24,7 +24,7 @@
*/ */
#include <audio/algo/chunkware/GateRms.h> #include <audio/algo/chunkware/GateRms.hpp>
audio::algo::chunkware::GateRms::GateRms() : audio::algo::chunkware::GateRms::GateRms() :
m_averager(5.0), m_averager(5.0),

2
audio/algo/chunkware/GateRms.h → audio/algo/chunkware/GateRms.hpp
View File

@@ -24,7 +24,7 @@
*/ */
#pragma once #pragma once
#include <audio/algo/chunkware/Gate.h> #include <audio/algo/chunkware/Gate.hpp>
namespace audio { namespace audio {
namespace algo { namespace algo {

4
audio/algo/chunkware/Limiter.cpp
View File

@@ -24,8 +24,8 @@
*/ */
#include <audio/algo/chunkware/Limiter.h> #include <audio/algo/chunkware/Limiter.hpp>
#include <audio/algo/chunkware/debug.h> #include <audio/algo/chunkware/debug.hpp>
#include <cmath> #include <cmath>
audio::algo::chunkware::Limiter::Limiter() : audio::algo::chunkware::Limiter::Limiter() :

8
audio/algo/chunkware/Limiter.h → audio/algo/chunkware/Limiter.hpp
View File

@@ -24,10 +24,10 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
#include <audio/format.h> #include <audio/format.hpp>
#include <audio/algo/chunkware/AttRelEnvelope.h> #include <audio/algo/chunkware/AttRelEnvelope.hpp>
#include <audio/algo/chunkware/Gain.h> #include <audio/algo/chunkware/Gain.hpp>
#include <chrono> #include <chrono>
#include <vector> #include <vector>

2
audio/algo/chunkware/debug.cpp
View File

@@ -23,7 +23,7 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include "debug.h" #include "debug.hpp"
int32_t audio::algo::chunkware::getLogId() { int32_t audio::algo::chunkware::getLogId() {

2
audio/algo/chunkware/debug.h → audio/algo/chunkware/debug.hpp
View File

@@ -25,7 +25,7 @@
#pragma once #pragma once
#include <elog/log.h> #include <elog/log.hpp>
namespace audio { namespace audio {
namespace algo { namespace algo {

1
authors.txt Normal file
View File

@@ -0,0 +1 @@
MR Edouard DUPIN <yui.heero@gmail.com>

12
lutin_audio-algo-chunkware-test.py
View File

@@ -1,7 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.module as module
import lutin.tools as tools
import lutin.debug as debug import lutin.debug as debug
import lutin.tools as tools
def get_type(): def get_type():
@@ -23,15 +22,14 @@ def get_compagny_name():
return "atria-soft" return "atria-soft"
def get_maintainer(): def get_maintainer():
return ["Mr DUPIN Edouard <yui.heero@gmail.com>"] return "authors.txt"
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_src_file([ my_module.add_src_file([
'test/main.cpp' 'test/main.cpp'
]) ])
my_module.add_module_depend(['audio-algo-chunkware', 'test-debug']) my_module.add_depend(['audio-algo-chunkware', 'test-debug'])
return my_module return True

32
lutin_audio-algo-chunkware.py
View File

@@ -1,7 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
import lutin.module as module
import lutin.tools as tools
import lutin.debug as debug import lutin.debug as debug
import lutin.tools as tools
def get_type(): def get_type():
@@ -20,13 +19,12 @@ def get_compagny_name():
return "atria-soft" return "atria-soft"
def get_maintainer(): def get_maintainer():
return ["Mr DUPIN Edouard <yui.heero@gmail.com>"] return "authors.txt"
def get_version(): def get_version():
return [0,1,0] return "version.txt"
def create(target, module_name): def configure(target, my_module):
my_module = module.Module(__file__, module_name, get_type())
my_module.add_src_file([ my_module.add_src_file([
'audio/algo/chunkware/debug.cpp', 'audio/algo/chunkware/debug.cpp',
'audio/algo/chunkware/Compressor.cpp', 'audio/algo/chunkware/Compressor.cpp',
@@ -38,18 +36,18 @@ def create(target, module_name):
'audio/algo/chunkware/Limiter.cpp' 'audio/algo/chunkware/Limiter.cpp'
]) ])
my_module.add_header_file([ my_module.add_header_file([
'audio/algo/chunkware/Compressor.h', 'audio/algo/chunkware/Compressor.hpp',
'audio/algo/chunkware/debug.h', 'audio/algo/chunkware/debug.hpp',
'audio/algo/chunkware/EnvelopeDetector.h', 'audio/algo/chunkware/EnvelopeDetector.hpp',
'audio/algo/chunkware/AttRelEnvelope.h', 'audio/algo/chunkware/AttRelEnvelope.hpp',
'audio/algo/chunkware/Gate.h', 'audio/algo/chunkware/Gate.hpp',
'audio/algo/chunkware/GateRms.h', 'audio/algo/chunkware/GateRms.hpp',
'audio/algo/chunkware/Gain.h', 'audio/algo/chunkware/Gain.hpp',
'audio/algo/chunkware/Limiter.h' 'audio/algo/chunkware/Limiter.hpp'
]) ])
my_module.add_module_depend(['etk', 'audio']) my_module.add_depend(['etk', 'audio'])
my_module.add_path(tools.get_current_path(__file__)) my_module.add_path(".")
return my_module return True

25
test/main.cpp
View File

@@ -4,15 +4,16 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <test-debug/debug.h> #include <test-debug/debug.hpp>
#include <etk/etk.h> #include <etk/etk.hpp>
#include <audio/algo/chunkware/Compressor.h> #include <audio/algo/chunkware/Compressor.hpp>
#include <audio/algo/chunkware/Limiter.h> #include <audio/algo/chunkware/Limiter.hpp>
#include <audio/algo/chunkware/Gate.h> #include <audio/algo/chunkware/Gate.hpp>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.hpp>
#include <chrono> #include <chrono>
#include <thread>
#include <unistd.h>
static std::vector<double> convert(const std::vector<int16_t>& _data) { static std::vector<double> convert(const std::vector<int16_t>& _data) {
std::vector<double> out; std::vector<double> out;
@@ -107,7 +108,7 @@ void performanceCompressor() {
perfo.tic(); perfo.tic();
algo.process(&output[0], &input[0], input.size(), 1, audio::format_double); algo.process(&output[0], &input[0], input.size(), 1, audio::format_double);
perfo.toc(); perfo.toc();
usleep(1000); std::this_thread::sleep_for(std::chrono::milliseconds(1));
} }
TEST_PRINT("Performance Compressor (double): "); TEST_PRINT("Performance Compressor (double): ");
TEST_PRINT(" blockSize=" << input.size() << " sample"); TEST_PRINT(" blockSize=" << input.size() << " sample");
@@ -148,7 +149,7 @@ void performanceLimiter() {
perfo.tic(); perfo.tic();
algo.process(&output[0], &input[0], input.size(), 1, audio::format_double); algo.process(&output[0], &input[0], input.size(), 1, audio::format_double);
perfo.toc(); perfo.toc();
usleep(1000); std::this_thread::sleep_for(std::chrono::milliseconds(1));
} }
TEST_PRINT("Performance Limiter (double): "); TEST_PRINT("Performance Limiter (double): ");
TEST_PRINT(" blockSize=" << input.size() << " sample"); TEST_PRINT(" blockSize=" << input.size() << " sample");
@@ -189,7 +190,7 @@ void performanceGate() {
perfo.tic(); perfo.tic();
algo.process(&output[0], &input[0], input.size(), 1, audio::format_double); algo.process(&output[0], &input[0], input.size(), 1, audio::format_double);
perfo.toc(); perfo.toc();
usleep(1000); std::this_thread::sleep_for(std::chrono::milliseconds(1));
} }
TEST_PRINT("Performance Gate (double): "); TEST_PRINT("Performance Gate (double): ");
TEST_PRINT(" blockSize=" << input.size() << " sample"); TEST_PRINT(" blockSize=" << input.size() << " sample");
@@ -270,7 +271,7 @@ int main(int _argc, const char** _argv) {
algo.process(audio::format_double, &output[iii*blockSize], &inputData[iii*blockSize], blockSize, 1); algo.process(audio::format_double, &output[iii*blockSize], &inputData[iii*blockSize], blockSize, 1);
if (perf == true) { if (perf == true) {
perfo.toc(); perfo.toc();
usleep(1000); std::this_thread::sleep_for(std::chrono::milliseconds(1));
} }
} }
*/ */
@@ -292,7 +293,7 @@ int main(int _argc, const char** _argv) {
algo.process(&output[iii*blockSize], &inputData[iii*blockSize], blockSize, 1, audio::format_double); algo.process(&output[iii*blockSize], &inputData[iii*blockSize], blockSize, 1, audio::format_double);
if (perf == true) { if (perf == true) {
perfo.toc(); perfo.toc();
usleep(1000); std::this_thread::sleep_for(std::chrono::milliseconds(1));
} }
} }

1
version.txt Normal file
View File

@@ -0,0 +1 @@
0.2.0