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

[DEV] update of external of elog and ethread

Browse Source
This commit is contained in:
Edouard DUPIN 2016-03-08 21:29:34 +01:00
parent e08a41fa07
commit fcf76e9b19
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/algo/speex/Resampler.cpp
View File

@ -126,7 +126,7 @@ audio::algo::speex::Resampler::~Resampler() {
void audio::algo::speex::Resampler::init(int8_t _nbChannel, float _inputSampleRate, float _outputSampleRate, int8_t _quality, enum audio::format _format) { void audio::algo::speex::Resampler::init(int8_t _nbChannel, float _inputSampleRate, float _outputSampleRate, int8_t _quality, enum audio::format _format) {
m_private.reset(); m_private.reset();
m_private = std11::make_shared<audio::algo::speex::ResamplerPrivate>(_nbChannel, _inputSampleRate, _outputSampleRate, _quality, _format); m_private = std::make_shared<audio::algo::speex::ResamplerPrivate>(_nbChannel, _inputSampleRate, _outputSampleRate, _quality, _format);
} }
std::vector<enum audio::format> audio::algo::speex::Resampler::getSupportedFormat() { std::vector<enum audio::format> audio::algo::speex::Resampler::getSupportedFormat() {

2
audio/algo/speex/Resampler.h
View File

@ -49,7 +49,7 @@ namespace audio {
*/ */
virtual void process(void* _output, size_t& _nbChunkOut, const void* _input, size_t _nbChunk); virtual void process(void* _output, size_t& _nbChunkOut, const void* _input, size_t _nbChunk);
protected: protected:
std11::shared_ptr<ResamplerPrivate> m_private; // private data. std::shared_ptr<ResamplerPrivate> m_private; // private data.
}; };
} }
} }

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

@ -8,7 +8,7 @@
int32_t audio::algo::speex::getLogId() { int32_t audio::algo::speex::getLogId() {
static int32_t g_val = etk::log::registerInstance("audio-algo-speex"); static int32_t g_val = elog::registerInstance("audio-algo-speex");
return g_val; return g_val;
} }

4
audio/algo/speex/debug.h
View File

@ -5,7 +5,7 @@
*/ */
#pragma once #pragma once
#include <etk/log.h> #include <elog/log.h>
namespace audio { namespace audio {
namespace algo { namespace algo {
@ -15,7 +15,7 @@ namespace audio {
} }
} }
#define AA_SPEEX_BASE(info,data) TK_LOG_BASE(audio::algo::speex::getLogId(),info,data) #define AA_SPEEX_BASE(info,data) ELOG_BASE(audio::algo::speex::getLogId(),info,data)
#define AA_SPEEX_PRINT(data) AA_SPEEX_BASE(-1, data) #define AA_SPEEX_PRINT(data) AA_SPEEX_BASE(-1, data)
#define AA_SPEEX_CRITICAL(data) AA_SPEEX_BASE(1, data) #define AA_SPEEX_CRITICAL(data) AA_SPEEX_BASE(1, data)

22
test/main.cpp
View File

@ -17,11 +17,11 @@
class Performance { class Performance {
private: private:
std11::chrono::steady_clock::time_point m_timeStart; std::chrono::steady_clock::time_point m_timeStart;
std11::chrono::steady_clock::time_point m_timeStop; std::chrono::steady_clock::time_point m_timeStop;
std11::chrono::nanoseconds m_totalTimeProcessing; std::chrono::nanoseconds m_totalTimeProcessing;
std11::chrono::nanoseconds m_minProcessing; std::chrono::nanoseconds m_minProcessing;
std11::chrono::nanoseconds m_maxProcessing; std::chrono::nanoseconds m_maxProcessing;
int32_t m_totalIteration; int32_t m_totalIteration;
public: public:
Performance() : Performance() :
@ -32,11 +32,11 @@ class Performance {
} }
void tic() { void tic() {
m_timeStart = std11::chrono::steady_clock::now(); m_timeStart = std::chrono::steady_clock::now();
} }
void toc() { void toc() {
m_timeStop = std11::chrono::steady_clock::now(); m_timeStop = std::chrono::steady_clock::now();
std11::chrono::nanoseconds time = m_timeStop - m_timeStart; std::chrono::nanoseconds time = m_timeStop - m_timeStart;
m_minProcessing = std::min(m_minProcessing, time); m_minProcessing = std::min(m_minProcessing, time);
m_maxProcessing = std::max(m_maxProcessing, time); m_maxProcessing = std::max(m_maxProcessing, time);
m_totalTimeProcessing += time; m_totalTimeProcessing += time;
@ -44,13 +44,13 @@ class Performance {
} }
std11::chrono::nanoseconds getTotalTimeProcessing() { std::chrono::nanoseconds getTotalTimeProcessing() {
return m_totalTimeProcessing; return m_totalTimeProcessing;
} }
std11::chrono::nanoseconds getMinProcessing() { std::chrono::nanoseconds getMinProcessing() {
return m_minProcessing; return m_minProcessing;
} }
std11::chrono::nanoseconds getMaxProcessing() { std::chrono::nanoseconds getMaxProcessing() {
return m_maxProcessing; return m_maxProcessing;
} }
int32_t getTotalIteration() { int32_t getTotalIteration() {