Compare commits
18 Commits
Author | SHA1 | Date | |
---|---|---|---|
0c239f2c38 | |||
8ce65a81f2 | |||
6fd8eb2879 | |||
a6088f420f | |||
e6fbd23054 | |||
b74ff1455f | |||
00fc6bec02 | |||
7c441c30ce | |||
0010fc3f19 | |||
aa6047c8eb | |||
6bedd63c18 | |||
a4ca5aa09c | |||
99521d9c6f | |||
0ffc0377d0 | |||
fd8f51ed0b | |||
d6ee980946 | |||
02c66ec75b | |||
6b055f1782 |
373
LICENSE
Normal file
373
LICENSE
Normal file
@ -0,0 +1,373 @@
|
||||
Mozilla Public License Version 2.0
|
||||
==================================
|
||||
|
||||
1. Definitions
|
||||
--------------
|
||||
|
||||
1.1. "Contributor"
|
||||
means each individual or legal entity that creates, contributes to
|
||||
the creation of, or owns Covered Software.
|
||||
|
||||
1.2. "Contributor Version"
|
||||
means the combination of the Contributions of others (if any) used
|
||||
by a Contributor and that particular Contributor's Contribution.
|
||||
|
||||
1.3. "Contribution"
|
||||
means Covered Software of a particular Contributor.
|
||||
|
||||
1.4. "Covered Software"
|
||||
means Source Code Form to which the initial Contributor has attached
|
||||
the notice in Exhibit A, the Executable Form of such Source Code
|
||||
Form, and Modifications of such Source Code Form, in each case
|
||||
including portions thereof.
|
||||
|
||||
1.5. "Incompatible With Secondary Licenses"
|
||||
means
|
||||
|
||||
(a) that the initial Contributor has attached the notice described
|
||||
in Exhibit B to the Covered Software; or
|
||||
|
||||
(b) that the Covered Software was made available under the terms of
|
||||
version 1.1 or earlier of the License, but not also under the
|
||||
terms of a Secondary License.
|
||||
|
||||
1.6. "Executable Form"
|
||||
means any form of the work other than Source Code Form.
|
||||
|
||||
1.7. "Larger Work"
|
||||
means a work that combines Covered Software with other material, in
|
||||
a separate file or files, that is not Covered Software.
|
||||
|
||||
1.8. "License"
|
||||
means this document.
|
||||
|
||||
1.9. "Licensable"
|
||||
means having the right to grant, to the maximum extent possible,
|
||||
whether at the time of the initial grant or subsequently, any and
|
||||
all of the rights conveyed by this License.
|
||||
|
||||
1.10. "Modifications"
|
||||
means any of the following:
|
||||
|
||||
(a) any file in Source Code Form that results from an addition to,
|
||||
deletion from, or modification of the contents of Covered
|
||||
Software; or
|
||||
|
||||
(b) any new file in Source Code Form that contains any Covered
|
||||
Software.
|
||||
|
||||
1.11. "Patent Claims" of a Contributor
|
||||
means any patent claim(s), including without limitation, method,
|
||||
process, and apparatus claims, in any patent Licensable by such
|
||||
Contributor that would be infringed, but for the grant of the
|
||||
License, by the making, using, selling, offering for sale, having
|
||||
made, import, or transfer of either its Contributions or its
|
||||
Contributor Version.
|
||||
|
||||
1.12. "Secondary License"
|
||||
means either the GNU General Public License, Version 2.0, the GNU
|
||||
Lesser General Public License, Version 2.1, the GNU Affero General
|
||||
Public License, Version 3.0, or any later versions of those
|
||||
licenses.
|
||||
|
||||
1.13. "Source Code Form"
|
||||
means the form of the work preferred for making modifications.
|
||||
|
||||
1.14. "You" (or "Your")
|
||||
means an individual or a legal entity exercising rights under this
|
||||
License. For legal entities, "You" includes any entity that
|
||||
controls, is controlled by, or is under common control with You. For
|
||||
purposes of this definition, "control" means (a) the power, direct
|
||||
or indirect, to cause the direction or management of such entity,
|
||||
whether by contract or otherwise, or (b) ownership of more than
|
||||
fifty percent (50%) of the outstanding shares or beneficial
|
||||
ownership of such entity.
|
||||
|
||||
2. License Grants and Conditions
|
||||
--------------------------------
|
||||
|
||||
2.1. Grants
|
||||
|
||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||
non-exclusive license:
|
||||
|
||||
(a) under intellectual property rights (other than patent or trademark)
|
||||
Licensable by such Contributor to use, reproduce, make available,
|
||||
modify, display, perform, distribute, and otherwise exploit its
|
||||
Contributions, either on an unmodified basis, with Modifications, or
|
||||
as part of a Larger Work; and
|
||||
|
||||
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
||||
for sale, have made, import, and otherwise transfer either its
|
||||
Contributions or its Contributor Version.
|
||||
|
||||
2.2. Effective Date
|
||||
|
||||
The licenses granted in Section 2.1 with respect to any Contribution
|
||||
become effective for each Contribution on the date the Contributor first
|
||||
distributes such Contribution.
|
||||
|
||||
2.3. Limitations on Grant Scope
|
||||
|
||||
The licenses granted in this Section 2 are the only rights granted under
|
||||
this License. No additional rights or licenses will be implied from the
|
||||
distribution or licensing of Covered Software under this License.
|
||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
||||
Contributor:
|
||||
|
||||
(a) for any code that a Contributor has removed from Covered Software;
|
||||
or
|
||||
|
||||
(b) for infringements caused by: (i) Your and any other third party's
|
||||
modifications of Covered Software, or (ii) the combination of its
|
||||
Contributions with other software (except as part of its Contributor
|
||||
Version); or
|
||||
|
||||
(c) under Patent Claims infringed by Covered Software in the absence of
|
||||
its Contributions.
|
||||
|
||||
This License does not grant any rights in the trademarks, service marks,
|
||||
or logos of any Contributor (except as may be necessary to comply with
|
||||
the notice requirements in Section 3.4).
|
||||
|
||||
2.4. Subsequent Licenses
|
||||
|
||||
No Contributor makes additional grants as a result of Your choice to
|
||||
distribute the Covered Software under a subsequent version of this
|
||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
||||
permitted under the terms of Section 3.3).
|
||||
|
||||
2.5. Representation
|
||||
|
||||
Each Contributor represents that the Contributor believes its
|
||||
Contributions are its original creation(s) or it has sufficient rights
|
||||
to grant the rights to its Contributions conveyed by this License.
|
||||
|
||||
2.6. Fair Use
|
||||
|
||||
This License is not intended to limit any rights You have under
|
||||
applicable copyright doctrines of fair use, fair dealing, or other
|
||||
equivalents.
|
||||
|
||||
2.7. Conditions
|
||||
|
||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
||||
in Section 2.1.
|
||||
|
||||
3. Responsibilities
|
||||
-------------------
|
||||
|
||||
3.1. Distribution of Source Form
|
||||
|
||||
All distribution of Covered Software in Source Code Form, including any
|
||||
Modifications that You create or to which You contribute, must be under
|
||||
the terms of this License. You must inform recipients that the Source
|
||||
Code Form of the Covered Software is governed by the terms of this
|
||||
License, and how they can obtain a copy of this License. You may not
|
||||
attempt to alter or restrict the recipients' rights in the Source Code
|
||||
Form.
|
||||
|
||||
3.2. Distribution of Executable Form
|
||||
|
||||
If You distribute Covered Software in Executable Form then:
|
||||
|
||||
(a) such Covered Software must also be made available in Source Code
|
||||
Form, as described in Section 3.1, and You must inform recipients of
|
||||
the Executable Form how they can obtain a copy of such Source Code
|
||||
Form by reasonable means in a timely manner, at a charge no more
|
||||
than the cost of distribution to the recipient; and
|
||||
|
||||
(b) You may distribute such Executable Form under the terms of this
|
||||
License, or sublicense it under different terms, provided that the
|
||||
license for the Executable Form does not attempt to limit or alter
|
||||
the recipients' rights in the Source Code Form under this License.
|
||||
|
||||
3.3. Distribution of a Larger Work
|
||||
|
||||
You may create and distribute a Larger Work under terms of Your choice,
|
||||
provided that You also comply with the requirements of this License for
|
||||
the Covered Software. If the Larger Work is a combination of Covered
|
||||
Software with a work governed by one or more Secondary Licenses, and the
|
||||
Covered Software is not Incompatible With Secondary Licenses, this
|
||||
License permits You to additionally distribute such Covered Software
|
||||
under the terms of such Secondary License(s), so that the recipient of
|
||||
the Larger Work may, at their option, further distribute the Covered
|
||||
Software under the terms of either this License or such Secondary
|
||||
License(s).
|
||||
|
||||
3.4. Notices
|
||||
|
||||
You may not remove or alter the substance of any license notices
|
||||
(including copyright notices, patent notices, disclaimers of warranty,
|
||||
or limitations of liability) contained within the Source Code Form of
|
||||
the Covered Software, except that You may alter any license notices to
|
||||
the extent required to remedy known factual inaccuracies.
|
||||
|
||||
3.5. Application of Additional Terms
|
||||
|
||||
You may choose to offer, and to charge a fee for, warranty, support,
|
||||
indemnity or liability obligations to one or more recipients of Covered
|
||||
Software. However, You may do so only on Your own behalf, and not on
|
||||
behalf of any Contributor. You must make it absolutely clear that any
|
||||
such warranty, support, indemnity, or liability obligation is offered by
|
||||
You alone, and You hereby agree to indemnify every Contributor for any
|
||||
liability incurred by such Contributor as a result of warranty, support,
|
||||
indemnity or liability terms You offer. You may include additional
|
||||
disclaimers of warranty and limitations of liability specific to any
|
||||
jurisdiction.
|
||||
|
||||
4. Inability to Comply Due to Statute or Regulation
|
||||
---------------------------------------------------
|
||||
|
||||
If it is impossible for You to comply with any of the terms of this
|
||||
License with respect to some or all of the Covered Software due to
|
||||
statute, judicial order, or regulation then You must: (a) comply with
|
||||
the terms of this License to the maximum extent possible; and (b)
|
||||
describe the limitations and the code they affect. Such description must
|
||||
be placed in a text file included with all distributions of the Covered
|
||||
Software under this License. Except to the extent prohibited by statute
|
||||
or regulation, such description must be sufficiently detailed for a
|
||||
recipient of ordinary skill to be able to understand it.
|
||||
|
||||
5. Termination
|
||||
--------------
|
||||
|
||||
5.1. The rights granted under this License will terminate automatically
|
||||
if You fail to comply with any of its terms. However, if You become
|
||||
compliant, then the rights granted under this License from a particular
|
||||
Contributor are reinstated (a) provisionally, unless and until such
|
||||
Contributor explicitly and finally terminates Your grants, and (b) on an
|
||||
ongoing basis, if such Contributor fails to notify You of the
|
||||
non-compliance by some reasonable means prior to 60 days after You have
|
||||
come back into compliance. Moreover, Your grants from a particular
|
||||
Contributor are reinstated on an ongoing basis if such Contributor
|
||||
notifies You of the non-compliance by some reasonable means, this is the
|
||||
first time You have received notice of non-compliance with this License
|
||||
from such Contributor, and You become compliant prior to 30 days after
|
||||
Your receipt of the notice.
|
||||
|
||||
5.2. If You initiate litigation against any entity by asserting a patent
|
||||
infringement claim (excluding declaratory judgment actions,
|
||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
||||
directly or indirectly infringes any patent, then the rights granted to
|
||||
You by any and all Contributors for the Covered Software under Section
|
||||
2.1 of this License shall terminate.
|
||||
|
||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
||||
end user license agreements (excluding distributors and resellers) which
|
||||
have been validly granted by You or Your distributors under this License
|
||||
prior to termination shall survive termination.
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 6. Disclaimer of Warranty *
|
||||
* ------------------------- *
|
||||
* *
|
||||
* Covered Software is provided under this License on an "as is" *
|
||||
* basis, without warranty of any kind, either expressed, implied, or *
|
||||
* statutory, including, without limitation, warranties that the *
|
||||
* Covered Software is free of defects, merchantable, fit for a *
|
||||
* particular purpose or non-infringing. The entire risk as to the *
|
||||
* quality and performance of the Covered Software is with You. *
|
||||
* Should any Covered Software prove defective in any respect, You *
|
||||
* (not any Contributor) assume the cost of any necessary servicing, *
|
||||
* repair, or correction. This disclaimer of warranty constitutes an *
|
||||
* essential part of this License. No use of any Covered Software is *
|
||||
* authorized under this License except under this disclaimer. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 7. Limitation of Liability *
|
||||
* -------------------------- *
|
||||
* *
|
||||
* Under no circumstances and under no legal theory, whether tort *
|
||||
* (including negligence), contract, or otherwise, shall any *
|
||||
* Contributor, or anyone who distributes Covered Software as *
|
||||
* permitted above, be liable to You for any direct, indirect, *
|
||||
* special, incidental, or consequential damages of any character *
|
||||
* including, without limitation, damages for lost profits, loss of *
|
||||
* goodwill, work stoppage, computer failure or malfunction, or any *
|
||||
* and all other commercial damages or losses, even if such party *
|
||||
* shall have been informed of the possibility of such damages. This *
|
||||
* limitation of liability shall not apply to liability for death or *
|
||||
* personal injury resulting from such party's negligence to the *
|
||||
* extent applicable law prohibits such limitation. Some *
|
||||
* jurisdictions do not allow the exclusion or limitation of *
|
||||
* incidental or consequential damages, so this exclusion and *
|
||||
* limitation may not apply to You. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
8. Litigation
|
||||
-------------
|
||||
|
||||
Any litigation relating to this License may be brought only in the
|
||||
courts of a jurisdiction where the defendant maintains its principal
|
||||
place of business and such litigation shall be governed by laws of that
|
||||
jurisdiction, without reference to its conflict-of-law provisions.
|
||||
Nothing in this Section shall prevent a party's ability to bring
|
||||
cross-claims or counter-claims.
|
||||
|
||||
9. Miscellaneous
|
||||
----------------
|
||||
|
||||
This License represents the complete agreement concerning the subject
|
||||
matter hereof. If any provision of this License is held to be
|
||||
unenforceable, such provision shall be reformed only to the extent
|
||||
necessary to make it enforceable. Any law or regulation which provides
|
||||
that the language of a contract shall be construed against the drafter
|
||||
shall not be used to construe this License against a Contributor.
|
||||
|
||||
10. Versions of the License
|
||||
---------------------------
|
||||
|
||||
10.1. New Versions
|
||||
|
||||
Mozilla Foundation is the license steward. Except as provided in Section
|
||||
10.3, no one other than the license steward has the right to modify or
|
||||
publish new versions of this License. Each version will be given a
|
||||
distinguishing version number.
|
||||
|
||||
10.2. Effect of New Versions
|
||||
|
||||
You may distribute the Covered Software under the terms of the version
|
||||
of the License under which You originally received the Covered Software,
|
||||
or under the terms of any subsequent version published by the license
|
||||
steward.
|
||||
|
||||
10.3. Modified Versions
|
||||
|
||||
If you create software not governed by this License, and you want to
|
||||
create a new license for such software, you may create and use a
|
||||
modified version of this License if you rename the license and remove
|
||||
any references to the name of the license steward (except to note that
|
||||
such modified license differs from this License).
|
||||
|
||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
||||
Licenses
|
||||
|
||||
If You choose to distribute Source Code Form that is Incompatible With
|
||||
Secondary Licenses under the terms of this version of the License, the
|
||||
notice described in Exhibit B of this License must be attached.
|
||||
|
||||
Exhibit A - Source Code Form License Notice
|
||||
-------------------------------------------
|
||||
|
||||
This Source Code Form is subject to the terms of the Mozilla Public
|
||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
If it is not possible or desirable to put the notice in a particular
|
||||
file, then You may include the notice in a location (such as a LICENSE
|
||||
file in a relevant directory) where a recipient would be likely to look
|
||||
for such a notice.
|
||||
|
||||
You may add additional accurate notices of copyright ownership.
|
||||
|
||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
||||
---------------------------------------------------------
|
||||
|
||||
This Source Code Form is "Incompatible With Secondary Licenses", as
|
||||
defined by the Mozilla Public License, v. 2.0.
|
@ -26,16 +26,16 @@ Dependency packages
|
||||
|
||||
sudo apt-get install g++
|
||||
|
||||
License (APACHE v2.0)
|
||||
License (MPL v2.0)
|
||||
=====================
|
||||
|
||||
Copyright audio-algo-aec Edouard DUPIN
|
||||
Copyright audio-algo-river Edouard DUPIN
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
Licensed under the Mozilla Public License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
https://www.mozilla.org/MPL/2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
|
@ -2,13 +2,13 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <audio/algo/river/debug.h>
|
||||
#include <audio/algo/river/Lms.h>
|
||||
#include <audio/algo/river/updateFilter.h>
|
||||
#include <audio/algo/river/convolution.h>
|
||||
#include <audio/algo/river/debug.hpp>
|
||||
#include <audio/algo/river/Lms.hpp>
|
||||
#include <audio/algo/river/updateFilter.hpp>
|
||||
#include <audio/algo/river/convolution.hpp>
|
||||
|
||||
#define MAX_PROCESSING_BLOCK_SIZE (256)
|
||||
|
||||
@ -20,8 +20,8 @@ namespace audio {
|
||||
int8_t m_nbChannel;
|
||||
float m_sampleRate;
|
||||
enum audio::format m_format;
|
||||
std::vector<std::vector<float> > m_filter; //!< Current filter
|
||||
std::vector<std::vector<float> > m_feedBack; //!< Feedback history
|
||||
etk::Vector<etk::Vector<float> > m_filter; //!< Current filter
|
||||
etk::Vector<etk::Vector<float> > m_feedBack; //!< Feedback history
|
||||
float m_mu; //!< mu step size
|
||||
public:
|
||||
LmsPrivate() :
|
||||
@ -91,7 +91,7 @@ namespace audio {
|
||||
float feedback[processingSize];
|
||||
float microphone[processingSize];
|
||||
int32_t offset = bbb*processingSize;
|
||||
int32_t nbData = std::min(processingSize,
|
||||
int32_t nbData = etk::min(processingSize,
|
||||
_nbSample - offset);
|
||||
for (size_t iii=0; iii<nbData; ++iii) {
|
||||
microphone[iii] = float(_microphone[offset+iii])/32767.0f;
|
||||
@ -119,17 +119,17 @@ namespace audio {
|
||||
return true;
|
||||
}
|
||||
|
||||
float processValue(float* _feedback, float _microphone, std::vector<float>& _filter) {
|
||||
float processValue(float* _feedback, float _microphone, etk::Vector<float>& _filter) {
|
||||
// Error calculation.
|
||||
float convolutionValue = audio::algo::river::convolution(_feedback, &_filter[0], _filter.size());
|
||||
float error = _microphone - convolutionValue;
|
||||
float out = std::avg(-1.0f, error, 1.0f);
|
||||
float out = etk::avg(-1.0f, error, 1.0f);
|
||||
audio::algo::river::updateFilter(&_filter[0], _feedback, error*m_mu, _filter.size());
|
||||
return out;
|
||||
}
|
||||
|
||||
void setFilterTime(std::chrono::microseconds _time) {
|
||||
setFilterSize((m_sampleRate*_time.count())/1000000LL);
|
||||
void setFilterTime(echrono::microseconds _time) {
|
||||
setFilterSize((m_sampleRate*_time.get())/1000000000LL);
|
||||
}
|
||||
|
||||
void setFilterSize(size_t _nbSample) {
|
||||
@ -160,55 +160,55 @@ audio::algo::river::Lms::~Lms(void) {
|
||||
}
|
||||
|
||||
void audio::algo::river::Lms::reset(void) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->reset();
|
||||
}
|
||||
|
||||
void audio::algo::river::Lms::init(int8_t _nbChannel, float _sampleRate, enum audio::format _format) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
m_private = ememory::makeShared<audio::algo::river::LmsPrivate>();
|
||||
}
|
||||
m_private->init(_nbChannel, _sampleRate, _format);
|
||||
}
|
||||
|
||||
std::vector<enum audio::format> audio::algo::river::Lms::getSupportedFormat() {
|
||||
std::vector<enum audio::format> out = getNativeSupportedFormat();
|
||||
out.push_back(audio::format_int16);
|
||||
etk::Vector<enum audio::format> audio::algo::river::Lms::getSupportedFormat() {
|
||||
etk::Vector<enum audio::format> out = getNativeSupportedFormat();
|
||||
out.pushBack(audio::format_int16);
|
||||
return out;
|
||||
}
|
||||
|
||||
std::vector<enum audio::format> audio::algo::river::Lms::getNativeSupportedFormat() {
|
||||
std::vector<enum audio::format> out;
|
||||
out.push_back(audio::format_float);
|
||||
etk::Vector<enum audio::format> audio::algo::river::Lms::getNativeSupportedFormat() {
|
||||
etk::Vector<enum audio::format> out;
|
||||
out.pushBack(audio::format_float);
|
||||
return out;
|
||||
}
|
||||
|
||||
void audio::algo::river::Lms::process(void* _output, const void* _input, const void* _inputFeedback, size_t _nbChunk) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->process(_output, _input, _inputFeedback, _nbChunk);
|
||||
}
|
||||
|
||||
|
||||
void audio::algo::river::Lms::setFilterTime(std::chrono::microseconds _time) {
|
||||
if (m_private == nullptr) {
|
||||
void audio::algo::river::Lms::setFilterTime(echrono::microseconds _time) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setFilterTime(_time);
|
||||
}
|
||||
|
||||
void audio::algo::river::Lms::setFilterSize(size_t _nbSample) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setFilterSize(_nbSample);
|
||||
}
|
||||
|
||||
void audio::algo::river::Lms::setMu(double _val) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setMu(_val);
|
||||
|
@ -2,14 +2,14 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <etk/types.h>
|
||||
#include <chrono>
|
||||
#include <audio/format.h>
|
||||
#include <ememory/memory.h>
|
||||
#include <etk/types.hpp>
|
||||
#include <echrono/Steady.hpp>
|
||||
#include <audio/format.hpp>
|
||||
#include <ememory/memory.hpp>
|
||||
|
||||
namespace audio {
|
||||
namespace algo {
|
||||
@ -93,12 +93,12 @@ namespace audio {
|
||||
* @brief Get list of format suported in input.
|
||||
* @return list of supported format
|
||||
*/
|
||||
virtual std::vector<enum audio::format> getSupportedFormat();
|
||||
virtual etk::Vector<enum audio::format> getSupportedFormat();
|
||||
/**
|
||||
* @brief Get list of algorithm format suported. No format convertion.
|
||||
* @return list of supported format
|
||||
*/
|
||||
virtual std::vector<enum audio::format> getNativeSupportedFormat();
|
||||
virtual etk::Vector<enum audio::format> getNativeSupportedFormat();
|
||||
/**
|
||||
* @brief Main input algo process.
|
||||
* @param[in,out] _output Output data.
|
||||
@ -115,7 +115,7 @@ namespace audio {
|
||||
* @brief Set filter size with specifing the filter temporal size and his samplerate
|
||||
* @param[in] _time Time of the filter size
|
||||
*/
|
||||
virtual void setFilterTime(std::chrono::microseconds _time);
|
||||
virtual void setFilterTime(echrono::microseconds _time);
|
||||
/**
|
||||
* @brief Set filter size in number of sample
|
||||
* @param[in] _nbSample Sample size of the filter
|
@ -2,28 +2,14 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <audio/algo/river/debug.h>
|
||||
#include <audio/algo/river/Nlms.h>
|
||||
#include <audio/algo/river/updateFilter.h>
|
||||
#include <audio/algo/river/convolution.h>
|
||||
#include <audio/algo/river/power.h>
|
||||
|
||||
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <audio/algo/river/debug.h>
|
||||
#include <audio/algo/river/Nlms.h>
|
||||
#include <audio/algo/river/updateFilter.h>
|
||||
#include <audio/algo/river/convolution.h>
|
||||
|
||||
#include <audio/algo/river/debug.hpp>
|
||||
#include <audio/algo/river/Nlms.hpp>
|
||||
#include <audio/algo/river/updateFilter.hpp>
|
||||
#include <audio/algo/river/convolution.hpp>
|
||||
#include <audio/algo/river/power.hpp>
|
||||
#define MAX_PROCESSING_BLOCK_SIZE (256)
|
||||
|
||||
namespace audio {
|
||||
@ -34,8 +20,8 @@ namespace audio {
|
||||
int8_t m_nbChannel;
|
||||
float m_sampleRate;
|
||||
enum audio::format m_format;
|
||||
std::vector<std::vector<float> > m_filter; //!< Current filter
|
||||
std::vector<std::vector<float> > m_feedBack; //!< Feedback history
|
||||
etk::Vector<etk::Vector<float> > m_filter; //!< Current filter
|
||||
etk::Vector<etk::Vector<float> > m_feedBack; //!< Feedback history
|
||||
float m_mu; //!< mu step size
|
||||
public:
|
||||
NlmsPrivate() :
|
||||
@ -105,7 +91,7 @@ namespace audio {
|
||||
float feedback[processingSize];
|
||||
float microphone[processingSize];
|
||||
int32_t offset = bbb*processingSize;
|
||||
int32_t nbData = std::min(processingSize,
|
||||
int32_t nbData = etk::min(processingSize,
|
||||
_nbSample - offset);
|
||||
for (size_t iii=0; iii<nbData; ++iii) {
|
||||
microphone[iii] = float(_microphone[offset+iii])/32767.0f;
|
||||
@ -133,11 +119,11 @@ namespace audio {
|
||||
return true;
|
||||
}
|
||||
|
||||
float processValue(float* _feedback, float _microphone, std::vector<float>& _filter) {
|
||||
float processValue(float* _feedback, float _microphone, etk::Vector<float>& _filter) {
|
||||
// Error calculation.
|
||||
float convolutionValue = audio::algo::river::convolution(_feedback, &_filter[0], _filter.size());
|
||||
float error = _microphone - convolutionValue;
|
||||
float out = std::avg(-1.0f, error, 1.0f);
|
||||
float out = etk::avg(-1.0f, error, 1.0f);
|
||||
// calculate mu:
|
||||
float mu = audio::algo::river::power(_feedback, _filter.size());
|
||||
//mu = *_feedback * *_feedback;
|
||||
@ -153,8 +139,8 @@ namespace audio {
|
||||
return out;
|
||||
}
|
||||
|
||||
void setFilterTime(std::chrono::microseconds _time) {
|
||||
setFilterSize((m_sampleRate*_time.count())/1000000LL);
|
||||
void setFilterTime(echrono::microseconds _time) {
|
||||
setFilterSize((m_sampleRate*_time.get())/1000000000LL);
|
||||
}
|
||||
|
||||
void setFilterSize(size_t _nbSample) {
|
||||
@ -185,55 +171,55 @@ audio::algo::river::Nlms::~Nlms(void) {
|
||||
}
|
||||
|
||||
void audio::algo::river::Nlms::reset(void) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->reset();
|
||||
}
|
||||
|
||||
void audio::algo::river::Nlms::init(int8_t _nbChannel, float _sampleRate, enum audio::format _format) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
m_private = ememory::makeShared<audio::algo::river::NlmsPrivate>();
|
||||
}
|
||||
m_private->init(_nbChannel, _sampleRate, _format);
|
||||
}
|
||||
|
||||
std::vector<enum audio::format> audio::algo::river::Nlms::getSupportedFormat() {
|
||||
std::vector<enum audio::format> out = getNativeSupportedFormat();
|
||||
out.push_back(audio::format_int16);
|
||||
etk::Vector<enum audio::format> audio::algo::river::Nlms::getSupportedFormat() {
|
||||
etk::Vector<enum audio::format> out = getNativeSupportedFormat();
|
||||
out.pushBack(audio::format_int16);
|
||||
return out;
|
||||
}
|
||||
|
||||
std::vector<enum audio::format> audio::algo::river::Nlms::getNativeSupportedFormat() {
|
||||
std::vector<enum audio::format> out;
|
||||
out.push_back(audio::format_float);
|
||||
etk::Vector<enum audio::format> audio::algo::river::Nlms::getNativeSupportedFormat() {
|
||||
etk::Vector<enum audio::format> out;
|
||||
out.pushBack(audio::format_float);
|
||||
return out;
|
||||
}
|
||||
|
||||
void audio::algo::river::Nlms::process(void* _output, const void* _input, const void* _inputFeedback, size_t _nbChunk) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->process(_output, _input, _inputFeedback, _nbChunk);
|
||||
}
|
||||
|
||||
|
||||
void audio::algo::river::Nlms::setFilterTime(std::chrono::microseconds _time) {
|
||||
if (m_private == nullptr) {
|
||||
void audio::algo::river::Nlms::setFilterTime(echrono::microseconds _time) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setFilterTime(_time);
|
||||
}
|
||||
|
||||
void audio::algo::river::Nlms::setFilterSize(size_t _nbSample) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setFilterSize(_nbSample);
|
||||
}
|
||||
|
||||
void audio::algo::river::Nlms::setMu(double _val) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setMu(_val);
|
||||
|
@ -2,14 +2,14 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <etk/types.h>
|
||||
#include <chrono>
|
||||
#include <audio/format.h>
|
||||
#include <ememory/memory.h>
|
||||
#include <etk/types.hpp>
|
||||
#include <echrono/Steady.hpp>
|
||||
#include <audio/format.hpp>
|
||||
#include <ememory/memory.hpp>
|
||||
|
||||
namespace audio {
|
||||
namespace algo {
|
||||
@ -93,12 +93,12 @@ namespace audio {
|
||||
* @brief Get list of format suported in input.
|
||||
* @return list of supported format
|
||||
*/
|
||||
virtual std::vector<enum audio::format> getSupportedFormat();
|
||||
virtual etk::Vector<enum audio::format> getSupportedFormat();
|
||||
/**
|
||||
* @brief Get list of algorithm format suported. No format convertion.
|
||||
* @return list of supported format
|
||||
*/
|
||||
virtual std::vector<enum audio::format> getNativeSupportedFormat();
|
||||
virtual etk::Vector<enum audio::format> getNativeSupportedFormat();
|
||||
/**
|
||||
* @brief Main input algo process.
|
||||
* @param[in,out] _output Output data.
|
||||
@ -115,7 +115,7 @@ namespace audio {
|
||||
* @brief Set filter size with specifing the filter temporal size and his samplerate
|
||||
* @param[in] _time Time of the filter size
|
||||
*/
|
||||
virtual void setFilterTime(std::chrono::microseconds _time);
|
||||
virtual void setFilterTime(echrono::microseconds _time);
|
||||
/**
|
||||
* @brief Set filter size in number of sample
|
||||
* @param[in] _nbSample Sample size of the filter
|
@ -2,11 +2,11 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <audio/algo/river/debug.h>
|
||||
#include <audio/algo/river/Suppressor.h>
|
||||
#include <audio/algo/river/debug.hpp>
|
||||
#include <audio/algo/river/Suppressor.hpp>
|
||||
|
||||
namespace audio {
|
||||
namespace algo {
|
||||
@ -88,36 +88,36 @@ namespace audio {
|
||||
* @brief Set the algo attaque time.
|
||||
* @param[in] _time Time of the attaque gain.
|
||||
*/
|
||||
virtual void setAttaqueTime(std::chrono::microseconds _time) {
|
||||
m_attaqueStep = 1.0 / float(int64_t(m_sampleRate) * 1000000LL / _time.count());
|
||||
virtual void setAttaqueTime(echrono::microseconds _time) {
|
||||
m_attaqueStep = 1.0 / float(int64_t(m_sampleRate) * 1000000000LL / _time.get());
|
||||
}
|
||||
/**
|
||||
* @brief Set the algo release time.
|
||||
* @param[in] _time Time of the release gain.
|
||||
*/
|
||||
virtual void setReleaseTime(std::chrono::microseconds _time) {
|
||||
m_releaseStep = 1.0 / float(int64_t(m_sampleRate) * 1000000LL / _time.count());
|
||||
virtual void setReleaseTime(echrono::microseconds _time) {
|
||||
m_releaseStep = 1.0 / float(int64_t(m_sampleRate) * 1000000000LL / _time.get());
|
||||
}
|
||||
/**
|
||||
* @brief Set the minimum Gain.
|
||||
* @param[in] _gain dB gain to apply for minimum.
|
||||
*/
|
||||
virtual void setMinimumGain(float _gain) {
|
||||
m_minGain = std::pow(10.0f, _gain/20.0f);
|
||||
m_minGain = etk::pow(10.0f, _gain/20.0f);
|
||||
}
|
||||
/**
|
||||
* @brief Set the threashold Gain.
|
||||
* @param[in] _gain dB gain to start removing data.
|
||||
*/
|
||||
virtual void setThreshold(float _gain) {
|
||||
m_threashold = std::pow(10.0f, _gain/20.0f);
|
||||
m_threashold = etk::pow(10.0f, _gain/20.0f);
|
||||
}
|
||||
/**
|
||||
* @brief Set the delay befor releasing time.
|
||||
* @param[in] _time Time of the dalay release.
|
||||
*/
|
||||
virtual void setReleaseDelay(std::chrono::microseconds _time) {
|
||||
m_nbSampleDelay = int64_t(m_sampleRate) * 1000000LL / _time.count();
|
||||
virtual void setReleaseDelay(echrono::microseconds _time) {
|
||||
m_nbSampleDelay = int64_t(m_sampleRate) * 1000000000LL / _time.get();
|
||||
}
|
||||
};
|
||||
}
|
||||
@ -133,68 +133,68 @@ audio::algo::river::Supressor::~Supressor(void) {
|
||||
}
|
||||
|
||||
void audio::algo::river::Supressor::reset(void) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->reset();
|
||||
}
|
||||
|
||||
void audio::algo::river::Supressor::init(int8_t _nbChannel, float _sampleRate, enum audio::format _format) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
m_private = ememory::makeShared<audio::algo::river::SupressorPrivate>();
|
||||
}
|
||||
m_private->init(_nbChannel, _sampleRate, _format);
|
||||
}
|
||||
|
||||
std::vector<enum audio::format> audio::algo::river::Supressor::getSupportedFormat() {
|
||||
std::vector<enum audio::format> out = getNativeSupportedFormat();
|
||||
etk::Vector<enum audio::format> audio::algo::river::Supressor::getSupportedFormat() {
|
||||
etk::Vector<enum audio::format> out = getNativeSupportedFormat();
|
||||
return out;
|
||||
}
|
||||
|
||||
std::vector<enum audio::format> audio::algo::river::Supressor::getNativeSupportedFormat() {
|
||||
std::vector<enum audio::format> out;
|
||||
out.push_back(audio::format_float);
|
||||
etk::Vector<enum audio::format> audio::algo::river::Supressor::getNativeSupportedFormat() {
|
||||
etk::Vector<enum audio::format> out;
|
||||
out.pushBack(audio::format_float);
|
||||
return out;
|
||||
}
|
||||
|
||||
void audio::algo::river::Supressor::process(void* _output, const void* _input, const void* _inputFeedback, size_t _nbChunk) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->process(_output, _input, _inputFeedback, _nbChunk);
|
||||
}
|
||||
|
||||
|
||||
void audio::algo::river::Supressor::setAttaqueTime(std::chrono::microseconds _time) {
|
||||
if (m_private == nullptr) {
|
||||
void audio::algo::river::Supressor::setAttaqueTime(echrono::microseconds _time) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setAttaqueTime(_time);
|
||||
}
|
||||
|
||||
void audio::algo::river::Supressor::setReleaseTime(std::chrono::microseconds _time) {
|
||||
if (m_private == nullptr) {
|
||||
void audio::algo::river::Supressor::setReleaseTime(echrono::microseconds _time) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setReleaseTime(_time);
|
||||
}
|
||||
|
||||
void audio::algo::river::Supressor::setMinimumGain(float _gain) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setMinimumGain(_gain);
|
||||
}
|
||||
|
||||
void audio::algo::river::Supressor::setThreshold(float _gain) {
|
||||
if (m_private == nullptr) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setThreshold(_gain);
|
||||
}
|
||||
|
||||
void audio::algo::river::Supressor::setReleaseDelay(std::chrono::microseconds _time) {
|
||||
if (m_private == nullptr) {
|
||||
void audio::algo::river::Supressor::setReleaseDelay(echrono::microseconds _time) {
|
||||
if (m_private == null) {
|
||||
AA_RIVER_ERROR("Algo is not initialized...");
|
||||
}
|
||||
m_private->setReleaseDelay(_time);
|
||||
|
@ -2,14 +2,14 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <etk/types.h>
|
||||
#include <chrono>
|
||||
#include <audio/format.h>
|
||||
#include <ememory/memory.h>
|
||||
#include <etk/types.hpp>
|
||||
#include <echrono/Steady.hpp>
|
||||
#include <audio/format.hpp>
|
||||
#include <ememory/memory.hpp>
|
||||
|
||||
namespace audio {
|
||||
namespace algo {
|
||||
@ -44,12 +44,12 @@ namespace audio {
|
||||
* @brief Get list of format suported in input.
|
||||
* @return list of supported format
|
||||
*/
|
||||
virtual std::vector<enum audio::format> getSupportedFormat();
|
||||
virtual etk::Vector<enum audio::format> getSupportedFormat();
|
||||
/**
|
||||
* @brief Get list of algorithm format suported. No format convertion.
|
||||
* @return list of supported format
|
||||
*/
|
||||
virtual std::vector<enum audio::format> getNativeSupportedFormat();
|
||||
virtual etk::Vector<enum audio::format> getNativeSupportedFormat();
|
||||
/**
|
||||
* @brief Main input algo process.
|
||||
* @param[in,out] _output Output data.
|
||||
@ -66,12 +66,12 @@ namespace audio {
|
||||
* @brief Set the algo attaque time.
|
||||
* @param[in] _time Time of the attaque gain.
|
||||
*/
|
||||
virtual void setAttaqueTime(std::chrono::microseconds _time);
|
||||
virtual void setAttaqueTime(echrono::microseconds _time);
|
||||
/**
|
||||
* @brief Set the algo release time.
|
||||
* @param[in] _time Time of the release gain.
|
||||
*/
|
||||
virtual void setReleaseTime(std::chrono::microseconds _time);
|
||||
virtual void setReleaseTime(echrono::microseconds _time);
|
||||
/**
|
||||
* @brief Set the minimum Gain.
|
||||
* @param[in] _gain dB gain to apply for minimum.
|
||||
@ -86,7 +86,7 @@ namespace audio {
|
||||
* @brief Set the delay befor releasing time.
|
||||
* @param[in] _time Time of the dalay release.
|
||||
*/
|
||||
virtual void setReleaseDelay(std::chrono::microseconds _time);
|
||||
virtual void setReleaseDelay(echrono::microseconds _time);
|
||||
};
|
||||
}
|
||||
}
|
@ -2,10 +2,10 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <audio/algo/river/convolution.h>
|
||||
#include <audio/algo/river/convolution.hpp>
|
||||
|
||||
float audio::algo::river::convolution(float* _dataMinus, float* _dataPlus, size_t _count) {
|
||||
float out = 0.0f;
|
||||
|
@ -2,11 +2,11 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <etk/types.h>
|
||||
#include <etk/types.hpp>
|
||||
|
||||
namespace audio {
|
||||
namespace algo {
|
@ -1,10 +1,10 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include "debug.h"
|
||||
#include "debug.hpp"
|
||||
|
||||
|
||||
int32_t audio::algo::river::getLogId() {
|
||||
|
@ -1,11 +1,11 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <elog/log.h>
|
||||
#include <elog/log.hpp>
|
||||
|
||||
namespace audio {
|
||||
namespace algo {
|
@ -2,10 +2,10 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <audio/algo/river/power.h>
|
||||
#include <audio/algo/river/power.hpp>
|
||||
|
||||
|
||||
float audio::algo::river::power(float* _data, int32_t _count) {
|
||||
|
@ -2,11 +2,11 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <etk/types.h>
|
||||
#include <etk/types.hpp>
|
||||
|
||||
namespace audio {
|
||||
namespace algo {
|
@ -2,10 +2,10 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <audio/algo/river/updateFilter.h>
|
||||
#include <audio/algo/river/updateFilter.hpp>
|
||||
|
||||
|
||||
void audio::algo::river::updateFilter(float* _filter, float* _data, float _value, int32_t _count) {
|
||||
|
@ -2,11 +2,11 @@
|
||||
* @author Edouard DUPIN
|
||||
* @author Fatima MARFOUQ
|
||||
* @copyright 2011, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <etk/types.h>
|
||||
#include <etk/types.hpp>
|
||||
|
||||
namespace audio {
|
||||
namespace algo {
|
1
authors.txt
Normal file
1
authors.txt
Normal file
@ -0,0 +1 @@
|
||||
MR Edouard DUPIN <yui.heero@gmail.com>
|
13
license.txt
13
license.txt
@ -1,13 +0,0 @@
|
||||
Copyright audio-algo-aec Edouard DUPIN
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
@ -1,7 +1,6 @@
|
||||
#!/usr/bin/python
|
||||
import lutin.module as module
|
||||
import lutin.tools as tools
|
||||
import lutin.debug as debug
|
||||
import realog.debug as debug
|
||||
|
||||
|
||||
def get_type():
|
||||
@ -14,7 +13,7 @@ def get_desc():
|
||||
return "test for River ALGO"
|
||||
|
||||
def get_licence():
|
||||
return "APACHE-2"
|
||||
return "MPL-2"
|
||||
|
||||
def get_compagny_type():
|
||||
return "com"
|
||||
@ -23,15 +22,17 @@ def get_compagny_name():
|
||||
return "atria-soft"
|
||||
|
||||
def get_maintainer():
|
||||
return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
|
||||
return "authors.txt"
|
||||
|
||||
def create(target, module_name):
|
||||
my_module = module.Module(__file__, module_name, get_type())
|
||||
def configure(target, my_module):
|
||||
my_module.add_src_file([
|
||||
'test/main.cpp'
|
||||
])
|
||||
my_module.add_module_depend(['audio-algo-river', 'test-debug'])
|
||||
return my_module
|
||||
'test/main.cpp'
|
||||
])
|
||||
my_module.add_depend([
|
||||
'audio-algo-river',
|
||||
'test-debug'
|
||||
])
|
||||
return True
|
||||
|
||||
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
#!/usr/bin/python
|
||||
import lutin.module as module
|
||||
import lutin.tools as tools
|
||||
import lutin.debug as debug
|
||||
import realog.debug as debug
|
||||
|
||||
|
||||
def get_type():
|
||||
@ -11,7 +10,7 @@ def get_desc():
|
||||
return "river algos"
|
||||
|
||||
def get_licence():
|
||||
return "APACHE-2"
|
||||
return "MPL-2"
|
||||
|
||||
def get_compagny_type():
|
||||
return "com"
|
||||
@ -20,13 +19,12 @@ def get_compagny_name():
|
||||
return "atria-soft"
|
||||
|
||||
def get_maintainer():
|
||||
return ["Mr DUPIN Edouard <yui.heero@gmail.com>"]
|
||||
return "authors.txt"
|
||||
|
||||
def get_version():
|
||||
return [0,1,0]
|
||||
return "version.txt"
|
||||
|
||||
def create(target, module_name):
|
||||
my_module = module.Module(__file__, module_name, get_type())
|
||||
def configure(target, my_module):
|
||||
my_module.add_src_file([
|
||||
'audio/algo/river/debug.cpp',
|
||||
'audio/algo/river/convolution.cpp',
|
||||
@ -37,16 +35,16 @@ def create(target, module_name):
|
||||
'audio/algo/river/Suppressor.cpp'
|
||||
])
|
||||
my_module.add_header_file([
|
||||
'audio/algo/river/convolution.h',
|
||||
'audio/algo/river/power.h',
|
||||
'audio/algo/river/updateFilter.h',
|
||||
'audio/algo/river/Lms.h',
|
||||
'audio/algo/river/Nlms.h',
|
||||
'audio/algo/river/Suppressor.h'
|
||||
'audio/algo/river/convolution.hpp',
|
||||
'audio/algo/river/power.hpp',
|
||||
'audio/algo/river/updateFilter.hpp',
|
||||
'audio/algo/river/Lms.hpp',
|
||||
'audio/algo/river/Nlms.hpp',
|
||||
'audio/algo/river/Suppressor.hpp'
|
||||
])
|
||||
my_module.add_module_depend(['etk', 'audio'])
|
||||
my_module.add_path(tools.get_current_path(__file__))
|
||||
return my_module
|
||||
my_module.add_depend(['etk', 'audio'])
|
||||
my_module.add_path(".")
|
||||
return True
|
||||
|
||||
|
||||
|
||||
|
109
test/main.cpp
109
test/main.cpp
@ -1,58 +1,56 @@
|
||||
/** @file
|
||||
* @author Edouard DUPIN
|
||||
* @copyright 2015, Edouard DUPIN, all right reserved
|
||||
* @license APACHE v2.0 (see license file)
|
||||
* @license MPL v2.0 (see license file)
|
||||
*/
|
||||
|
||||
#include <test-debug/debug.h>
|
||||
#include <etk/etk.h>
|
||||
#include <audio/algo/river/Lms.h>
|
||||
#include <audio/algo/river/Nlms.h>
|
||||
#include <etk/os/FSNode.h>
|
||||
#include <chrono>
|
||||
#include <ethread/tools.h>
|
||||
#include <test-debug/debug.hpp>
|
||||
#include <etk/etk.hpp>
|
||||
#include <etk/uri/uri.hpp>
|
||||
#include <audio/algo/river/Lms.hpp>
|
||||
#include <audio/algo/river/Nlms.hpp>
|
||||
#include <echrono/Steady.hpp>
|
||||
#include <ethread/tools.hpp>
|
||||
|
||||
|
||||
#include <unistd.h>
|
||||
#undef __class__
|
||||
#define __class__ "test"
|
||||
|
||||
|
||||
class Performance {
|
||||
private:
|
||||
std::chrono::steady_clock::time_point m_timeStart;
|
||||
std::chrono::steady_clock::time_point m_timeStop;
|
||||
std::chrono::nanoseconds m_totalTimeProcessing;
|
||||
std::chrono::nanoseconds m_minProcessing;
|
||||
std::chrono::nanoseconds m_maxProcessing;
|
||||
echrono::Steady m_timeStart;
|
||||
echrono::Steady m_timeStop;
|
||||
echrono::Duration m_totalTimeProcessing;
|
||||
echrono::Duration m_minProcessing;
|
||||
echrono::Duration m_maxProcessing;
|
||||
int32_t m_totalIteration;
|
||||
public:
|
||||
Performance() :
|
||||
m_totalTimeProcessing(0),
|
||||
m_minProcessing(99999999999999LL),
|
||||
m_minProcessing(int64_t(99999999999999LL)),
|
||||
m_maxProcessing(0),
|
||||
m_totalIteration(0) {
|
||||
|
||||
}
|
||||
void tic() {
|
||||
m_timeStart = std::chrono::steady_clock::now();
|
||||
m_timeStart = echrono::Steady::now();
|
||||
}
|
||||
void toc() {
|
||||
m_timeStop = std::chrono::steady_clock::now();
|
||||
std::chrono::nanoseconds time = m_timeStop - m_timeStart;
|
||||
m_minProcessing = std::min(m_minProcessing, time);
|
||||
m_maxProcessing = std::max(m_maxProcessing, time);
|
||||
m_timeStop = echrono::Steady::now();
|
||||
echrono::Duration time = m_timeStop - m_timeStart;
|
||||
m_minProcessing = etk::min(m_minProcessing, time);
|
||||
m_maxProcessing = etk::max(m_maxProcessing, time);
|
||||
m_totalTimeProcessing += time;
|
||||
m_totalIteration++;
|
||||
|
||||
}
|
||||
|
||||
std::chrono::nanoseconds getTotalTimeProcessing() {
|
||||
echrono::Duration getTotalTimeProcessing() {
|
||||
return m_totalTimeProcessing;
|
||||
}
|
||||
std::chrono::nanoseconds getMinProcessing() {
|
||||
echrono::Duration getMinProcessing() {
|
||||
return m_minProcessing;
|
||||
}
|
||||
std::chrono::nanoseconds getMaxProcessing() {
|
||||
echrono::Duration getMaxProcessing() {
|
||||
return m_maxProcessing;
|
||||
}
|
||||
int32_t getTotalIteration() {
|
||||
@ -66,15 +64,15 @@ int main(int _argc, const char** _argv) {
|
||||
// the only one init for etk:
|
||||
etk::init(_argc, _argv);
|
||||
ethread::setName("test thread");
|
||||
std::string fbName = "";
|
||||
std::string micName = "";
|
||||
etk::Path fbName;
|
||||
etk::Path micName;
|
||||
int32_t filterSize = 0;
|
||||
float mu = 0.0f;
|
||||
bool nlms = false;
|
||||
bool perf = false;
|
||||
int64_t sampleRate = 48000;
|
||||
for (int32_t iii=0; iii<_argc ; ++iii) {
|
||||
std::string data = _argv[iii];
|
||||
etk::String data = _argv[iii];
|
||||
if (etk::start_with(data,"--fb=")) {
|
||||
fbName = &data[5];
|
||||
} else if (etk::start_with(data,"--mic=")) {
|
||||
@ -107,8 +105,8 @@ int main(int _argc, const char** _argv) {
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
if ( fbName == ""
|
||||
|| micName == "") {
|
||||
if ( fbName.isEmpty() == true
|
||||
|| micName.isEmpty() == true) {
|
||||
TEST_ERROR("Can not Process missing parameters...");
|
||||
exit(-1);
|
||||
}
|
||||
@ -116,14 +114,26 @@ int main(int _argc, const char** _argv) {
|
||||
Performance perfo;
|
||||
|
||||
TEST_INFO("Read FeedBack:");
|
||||
std::vector<int16_t> fbData = etk::FSNodeReadAllDataType<int16_t>(fbName);
|
||||
etk::Vector<int16_t> fbData;
|
||||
{
|
||||
ememory::SharedPtr<etk::io::Interface> fileIO = etk::uri::get(fbName);
|
||||
fileIO->open(etk::io::OpenMode::Read);
|
||||
fbData = fileIO->readAll<int16_t>();
|
||||
fileIO->close();
|
||||
}
|
||||
TEST_INFO(" " << fbData.size() << " samples");
|
||||
TEST_INFO("Read Microphone:");
|
||||
std::vector<int16_t> micData = etk::FSNodeReadAllDataType<int16_t>(micName);
|
||||
etk::Vector<int16_t> micData;
|
||||
{
|
||||
ememory::SharedPtr<etk::io::Interface> fileIO = etk::uri::get(micName);
|
||||
fileIO->open(etk::io::OpenMode::Read);
|
||||
micData = fileIO->readAll<int16_t>();
|
||||
fileIO->close();
|
||||
}
|
||||
TEST_INFO(" " << micData.size() << " samples");
|
||||
// resize output :
|
||||
std::vector<int16_t> output;
|
||||
output.resize(std::min(fbData.size(), micData.size()), 0);
|
||||
etk::Vector<int16_t> output;
|
||||
output.resize(etk::min(fbData.size(), micData.size()), 0);
|
||||
// process in chunk of 256 samples
|
||||
int32_t blockSize = 256;
|
||||
if (nlms == false) {
|
||||
@ -150,7 +160,7 @@ int main(int _argc, const char** _argv) {
|
||||
algo.process(&output[iii*blockSize], &fbData[iii*blockSize], &micData[iii*blockSize], blockSize);
|
||||
if (perf == true) {
|
||||
perfo.toc();
|
||||
usleep(1000);
|
||||
ethread::sleepMilliSeconds((1));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -174,23 +184,30 @@ int main(int _argc, const char** _argv) {
|
||||
algo.process(&output[iii*blockSize], &fbData[iii*blockSize], &micData[iii*blockSize], blockSize);
|
||||
if (perf == true) {
|
||||
perfo.toc();
|
||||
usleep(1000);
|
||||
ethread::sleepMilliSeconds((1));
|
||||
}
|
||||
}
|
||||
}
|
||||
TEST_PRINT("Process done");
|
||||
if (perf == true) {
|
||||
TEST_PRINT("Performance Result: ");
|
||||
TEST_INFO(" blockSize=" << blockSize << " sample");
|
||||
TEST_INFO(" min < avg < max =" << perfo.getMinProcessing().count() << "ns < "
|
||||
<< perfo.getTotalTimeProcessing().count()/perfo.getTotalIteration() << "ns < "
|
||||
<< perfo.getMaxProcessing().count() << "ns ");
|
||||
float avg = (float(((perfo.getTotalTimeProcessing().count()/perfo.getTotalIteration())*sampleRate)/double(blockSize))/1000000000.0)*100.0;
|
||||
TEST_INFO(" min < avg < max= " << (float((perfo.getMinProcessing().count()*sampleRate)/double(blockSize))/1000000000.0)*100.0 << "% < "
|
||||
<< avg << "% < "
|
||||
<< (float((perfo.getMaxProcessing().count()*sampleRate)/double(blockSize))/1000000000.0)*100.0 << "%");
|
||||
TEST_PRINT("float : " << sampleRate << " : " << avg << "%");
|
||||
TEST_INFO(" blockSize=" << blockSize << " sample");
|
||||
TEST_INFO(" min < avg < max =" << perfo.getMinProcessing() << " < "
|
||||
<< perfo.getTotalTimeProcessing().get()/perfo.getTotalIteration() << "ns < "
|
||||
<< perfo.getMaxProcessing());
|
||||
float avg = (float(((perfo.getTotalTimeProcessing().get()/perfo.getTotalIteration())*sampleRate)/double(blockSize))/1000000000.0)*100.0;
|
||||
TEST_INFO(" min < avg < max= " << (float((perfo.getMinProcessing().get()*sampleRate)/double(blockSize))/1000000000.0)*100.0 << "% < "
|
||||
<< avg << "% < "
|
||||
<< (float((perfo.getMaxProcessing().get()*sampleRate)/double(blockSize))/1000000000.0)*100.0 << "%");
|
||||
TEST_PRINT("float : " << sampleRate << " : " << avg << "%");
|
||||
}
|
||||
{
|
||||
ememory::SharedPtr<etk::io::Interface> fileIO = etk::uri::get(etk::Path("output.raw"));
|
||||
if (fileIO->open(etk::io::OpenMode::Write) == false) {
|
||||
return -1;
|
||||
}
|
||||
fileIO->writeAll<int16_t>(output);
|
||||
fileIO->close();
|
||||
}
|
||||
etk::FSNodeWriteAllDataType<int16_t>("output.raw", output);
|
||||
}
|
||||
|
||||
|
1
version.txt
Normal file
1
version.txt
Normal file
@ -0,0 +1 @@
|
||||
1.0.0
|
Loading…
x
Reference in New Issue
Block a user