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

[DEV] create some log

Browse Source
This commit is contained in:
Edouard DUPIN 2015-02-09 21:44:32 +01:00
parent f9de8ca5b1
commit 2a3834a370
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drain/Algo.cpp
View File

@ -16,7 +16,7 @@ drain::Algo::Algo() :
m_outputData(), m_outputData(),
m_formatSize(0), m_formatSize(0),
m_needProcess(false) { m_needProcess(false) {
DRAIN_VERBOSE("CREATE ALGO");
} }
void drain::Algo::init() { void drain::Algo::init() {

1
drain/FormatUpdate.cpp
View File

@ -70,7 +70,6 @@ static void convert__int16_on_int32__to__float(void* _input, void* _output, size
// TODO : Set * intead of / // TODO : Set * intead of /
out[iii] = static_cast<float>(in[iii])/static_cast<float>(INT16_MAX); out[iii] = static_cast<float>(in[iii])/static_cast<float>(INT16_MAX);
} }
DRAIN_VERBOSE("plop : " << in[0] << " " << out[0]);
} }
static void convert__int32__to__int16(void* _input, void* _output, size_t _nbSample) { static void convert__int32__to__int16(void* _input, void* _output, size_t _nbSample) {

25
drain/Process.cpp
View File

@ -22,7 +22,7 @@
drain::Process::Process() : drain::Process::Process() :
m_isConfigured(false) { m_isConfigured(false) {
m_data.clear();
} }
drain::Process::~Process() { drain::Process::~Process() {
for (auto &it : m_listAlgo) { for (auto &it : m_listAlgo) {
@ -31,8 +31,8 @@ drain::Process::~Process() {
} }
bool drain::Process::push(std::chrono::system_clock::time_point& _time, bool drain::Process::push(std::chrono::system_clock::time_point& _time,
void* _data, void* _data,
size_t _nbChunk) { size_t _nbChunk) {
void* out = nullptr; void* out = nullptr;
size_t nbChunkOut; size_t nbChunkOut;
DRAIN_VERBOSE(" Process push"); DRAIN_VERBOSE(" Process push");
@ -41,9 +41,9 @@ bool drain::Process::push(std::chrono::system_clock::time_point& _time,
} }
bool drain::Process::pull(std::chrono::system_clock::time_point& _time, bool drain::Process::pull(std::chrono::system_clock::time_point& _time,
void* _data, void* _data,
size_t _nbChunk, size_t _nbChunk,
size_t _chunkSize) { size_t _chunkSize) {
//std::cout << " Interface DIRECT " << std::endl; //std::cout << " Interface DIRECT " << std::endl;
while(m_data.size()<_nbChunk*_chunkSize) { while(m_data.size()<_nbChunk*_chunkSize) {
void* in = NULL; void* in = NULL;
@ -81,7 +81,7 @@ bool drain::Process::pull(std::chrono::system_clock::time_point& _time,
memcpy(_data, &m_data[0], _nbChunk*_chunkSize); memcpy(_data, &m_data[0], _nbChunk*_chunkSize);
m_data.erase(m_data.begin(), m_data.begin()+_nbChunk*_chunkSize); m_data.erase(m_data.begin(), m_data.begin()+_nbChunk*_chunkSize);
} else { } else {
//std::cout << " * soft underflow" << std::endl; DRAIN_WARNING(" * soft underflow");
// ERROR // ERROR
m_data.clear(); m_data.clear();
} }
@ -221,7 +221,7 @@ void drain::Process::updateInterAlgo() {
std::vector<float> freq = getUnion<float>(freqOut, freqIn); std::vector<float> freq = getUnion<float>(freqOut, freqIn);
DRAIN_VERBOSE(" freq out :" << freqOut); DRAIN_VERBOSE(" freq out :" << freqOut);
DRAIN_VERBOSE(" freq in :" << freqIn); DRAIN_VERBOSE(" freq in :" << freqIn);
DRAIN_VERBOSE(" freq union :" << freq); DRAIN_DEBUG(" freq union :" << freq);
// step 2 : Check map: // step 2 : Check map:
std::vector<std::vector<audio::channel>> mapOut; std::vector<std::vector<audio::channel>> mapOut;
@ -239,7 +239,7 @@ void drain::Process::updateInterAlgo() {
std::vector<std::vector<audio::channel>> map = getUnion<std::vector<audio::channel>>(mapOut, mapIn); std::vector<std::vector<audio::channel>> map = getUnion<std::vector<audio::channel>>(mapOut, mapIn);
DRAIN_VERBOSE(" map out :" << mapOut); DRAIN_VERBOSE(" map out :" << mapOut);
DRAIN_VERBOSE(" map in :" << mapIn); DRAIN_VERBOSE(" map in :" << mapIn);
DRAIN_VERBOSE(" map union :" << map); DRAIN_DEBUG(" map union :" << map);
// step 3 : Check Format: // step 3 : Check Format:
std::vector<audio::format> formatOut; std::vector<audio::format> formatOut;
std::vector<audio::format> formatIn; std::vector<audio::format> formatIn;
@ -256,7 +256,7 @@ void drain::Process::updateInterAlgo() {
std::vector<audio::format> format = getUnion<audio::format>(formatOut, formatIn); std::vector<audio::format> format = getUnion<audio::format>(formatOut, formatIn);
DRAIN_VERBOSE(" format out :" << formatOut); DRAIN_VERBOSE(" format out :" << formatOut);
DRAIN_VERBOSE(" format in :" << formatIn); DRAIN_VERBOSE(" format in :" << formatIn);
DRAIN_VERBOSE(" format union :" << format); DRAIN_DEBUG(" format union :" << format);
if ( freq.size() >= 1 if ( freq.size() >= 1
&& map.size() >= 1 && map.size() >= 1
@ -352,10 +352,6 @@ void drain::Process::updateInterAlgo() {
} }
} }
} }
DRAIN_DEBUG(" union:");
DRAIN_DEBUG(" format : " << format);
DRAIN_DEBUG(" frequency : " << freq);
DRAIN_DEBUG(" map : " << map);
DRAIN_DEBUG(" update: out=" << out); DRAIN_DEBUG(" update: out=" << out);
DRAIN_DEBUG(" in=" << in); DRAIN_DEBUG(" in=" << in);
if (iii > 0) { if (iii > 0) {
@ -465,6 +461,7 @@ bool drain::Process::processIn(void* _inData,
return false; return false;
} }
// TODO : Do it better ... // TODO : Do it better ...
DRAIN_VERBOSE("Copy " << _outNbChunk << " chunks byte size=" << audio::getFormatBytes(m_outputConfig.getFormat()) << " nbChan=" << m_outputConfig.getMap().size() << " format=" << m_outputConfig.getFormat());
memcpy(_outData, outData, _outNbChunk*audio::getFormatBytes(m_outputConfig.getFormat()) * m_outputConfig.getMap().size()); memcpy(_outData, outData, _outNbChunk*audio::getFormatBytes(m_outputConfig.getFormat()) * m_outputConfig.getMap().size());
return false; return false;
} }

11
drain/Process.h
View File

@ -132,6 +132,17 @@ namespace drain{
} }
return nullptr; return nullptr;
} }
template<typename T> std::shared_ptr<const T> get(const std::string& _name) const {
for (auto &it : m_listAlgo) {
if (it == nullptr) {
continue;
}
if (it->getName() == _name) {
return std::dynamic_pointer_cast<T>(it);
}
}
return nullptr;
}
template<typename T> bool hasType() { template<typename T> bool hasType() {
for (auto &it : m_listAlgo) { for (auto &it : m_listAlgo) {
std::shared_ptr<T> tmp = std::dynamic_pointer_cast<T>(it); std::shared_ptr<T> tmp = std::dynamic_pointer_cast<T>(it);