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

[DEV] correct Channel muxer

Browse Source
This commit is contained in:
Edouard DUPIN 2015-03-05 21:28:39 +01:00
parent 6a3e364cd3
commit 720c8e7764
12 changed files with 205 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
river/Interface.cpp
View File

@ -363,31 +363,46 @@ void river::Interface::systemVolumeChange() {
static void link(etk::FSNode& _node, const std::string& _first, const std::string& _op, const std::string& _second, bool _isLink=true) { static void link(etk::FSNode& _node, const std::string& _first, const std::string& _op, const std::string& _second, bool _isLink=true) {
if (_op == "->") { if (_op == "->") {
if (_isLink) { if (_isLink) {
_node << " " << _first << " -> " << _second << ";\n"; _node << " " << _first << " -> " << _second << ";\n";
} else { } else {
_node << " " << _first << " -> " << _second << " [style=dashed];\n"; _node << " " << _first << " -> " << _second << " [style=dashed];\n";
} }
} else if (_op == "<-") { } else if (_op == "<-") {
_node << " " << _first << " -> " <<_second<< " [color=transparent];\n"; _node << " " << _first << " -> " <<_second<< " [color=transparent];\n";
if (_isLink) { if (_isLink) {
_node << " " << _second << " -> " << _first << " [constraint=false];\n"; _node << " " << _second << " -> " << _first << " [constraint=false];\n";
} else { } else {
_node << " " << _second << " -> " << _first << " [constraint=false, style=dashed];\n"; _node << " " << _second << " -> " << _first << " [constraint=false, style=dashed];\n";
} }
} }
} }
std::string river::Interface::getDotNodeName() const {
if (m_mode == river::modeInterface_input) {
return "API_" + etk::to_string(m_uid) + "_input";
} else if (m_mode == river::modeInterface_feedback) {
return "API_" + etk::to_string(m_uid) + "_feedback";
} else if (m_mode == river::modeInterface_output) {
return "API_" + etk::to_string(m_uid) + "_output";
}
return "error";
}
void river::Interface::generateDot(etk::FSNode& _node, const std::string& _nameIO, bool _isLink) { void river::Interface::generateDot(etk::FSNode& _node, const std::string& _nameIO, bool _isLink) {
_node << "subgraph clusterInterface_" << m_uid << " {\n"; _node << " subgraph clusterInterface_" << m_uid << " {\n";
_node << " color=orange;\n"; _node << " color=orange;\n";
_node << " label=\"[" << m_uid << "] Interface : " << m_name << "\";\n"; _node << " label=\"[" << m_uid << "] Interface : " << m_name << "\";\n";
_node << " subgraph clusterInterface_" << m_uid << "_process {\n"; _node << " subgraph clusterInterface_" << m_uid << "_process {\n";
_node << " label=\"Drain::Process\";\n"; _node << " label=\"Drain::Process\";\n";
_node << " node [shape=ellipse];\n"; _node << " node [shape=ellipse];\n";
_node << " INTERFACE_ALGO_" << m_uid << "_in [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\n in\" ];\n"; _node << " INTERFACE_ALGO_" << m_uid << "_in [ label=\"format=" << etk::to_string(m_process.getInputConfig().getFormat())
_node << " INTERFACE_ALGO_" << m_uid << "_out [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\n out\" ];\n"; << "\\n freq=" << m_process.getInputConfig().getFrequency()
_node << " }\n"; << "\\n channelMap=" << etk::to_string(m_process.getInputConfig().getMap()) << "\\n in\" ];\n";
_node << " INTERFACE_ALGO_" << m_uid << "_out [ label=\"format=" << etk::to_string(m_process.getOutputConfig().getFormat())
<< "\\n freq=" << m_process.getOutputConfig().getFrequency()
<< "\\n channelMap=" << etk::to_string(m_process.getOutputConfig().getMap()) << "\\n out\" ];\n";
_node << " }\n";
if ( m_mode == river::modeInterface_input if ( m_mode == river::modeInterface_input
|| m_mode == river::modeInterface_feedback) { || m_mode == river::modeInterface_feedback) {
link(_node, _nameIO, "->", "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_in", _isLink); link(_node, _nameIO, "->", "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_in", _isLink);
@ -396,17 +411,17 @@ void river::Interface::generateDot(etk::FSNode& _node, const std::string& _nameI
link(_node, _nameIO, "<-", "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_out", _isLink); link(_node, _nameIO, "<-", "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_out", _isLink);
link(_node, "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_out", "<-", "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_in"); link(_node, "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_out", "<-", "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_in");
} }
_node << " node [shape=Mdiamond];\n"; _node << " node [shape=Mdiamond];\n";
if (m_mode == river::modeInterface_input) { if (m_mode == river::modeInterface_input) {
_node << " API_" << m_uid << "_input [ label=\"API\nINPUT\" ];\n"; _node << " " << getDotNodeName() << " [ label=\"API\\nINPUT\" ];\n";
link(_node, "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_out", "->", "API_" + etk::to_string(m_uid) + "_input"); link(_node, "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_out", "->", getDotNodeName());
} else if (m_mode == river::modeInterface_feedback) { } else if (m_mode == river::modeInterface_feedback) {
_node << " API_" << m_uid << "_feedback [ label=\"API\nFEEDBACK\" ];\n"; _node << " " << getDotNodeName() << " [ label=\"API\\nFEEDBACK\" ];\n";
link(_node, "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_out", "->", "API_" + etk::to_string(m_uid) + "_feedback"); link(_node, "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_out", "->", getDotNodeName());
} else if (m_mode == river::modeInterface_output) { } else if (m_mode == river::modeInterface_output) {
_node << " API_" << m_uid << "_output [ label=\"API\nOUTPUT\" ];\n"; _node << " " << getDotNodeName() << " [ label=\"API\\nOUTPUT\" ];\n";
link(_node, "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_in", "<-", "API_" + etk::to_string(m_uid) + "_output"); link(_node, "INTERFACE_ALGO_" + etk::to_string(m_uid) + "_in", "<-", getDotNodeName());
} }
_node << "}\n"; _node << " }\n \n";
} }

1
river/Interface.h
View File

@ -209,6 +209,7 @@ namespace river {
float m_volume; //!< Local channel Volume float m_volume; //!< Local channel Volume
public: public:
virtual void generateDot(etk::FSNode& _node, const std::string& _nameIO, bool _isLink=true); virtual void generateDot(etk::FSNode& _node, const std::string& _nameIO, bool _isLink=true);
virtual std::string getDotNodeName() const;
}; };
}; };

6
river/io/Group.cpp
View File

@ -133,10 +133,12 @@ void river::io::Group::stop() {
} }
} }
void river::io::Group::generateDot(etk::FSNode& _node) { void river::io::Group::generateDot(etk::FSNode& _node, bool _hardwareNode) {
for (size_t iii=0; iii<m_list.size(); ++iii) { for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) { if (m_list[iii] != nullptr) {
m_list[iii]->generateDot(_node); if (m_list[iii]->isHarwareNode() == _hardwareNode) {
m_list[iii]->generateDot(_node);
}
} }
} }
} }

2
river/io/Group.h
View File

@ -27,7 +27,7 @@ namespace river {
std11::shared_ptr<river::io::Node> getNode(const std::string& _name); std11::shared_ptr<river::io::Node> getNode(const std::string& _name);
void start(); void start();
void stop(); void stop();
void generateDot(etk::FSNode& _node); void generateDot(etk::FSNode& _node, bool _hardwareNode);
}; };
} }
} }

45
river/io/Manager.cpp
View File

@ -234,20 +234,45 @@ void river::io::Manager::generateDot(const std::string& _filename) {
} }
node << "digraph G {" << "\n"; node << "digraph G {" << "\n";
node << " rankdir=\"LR\";\n"; node << " rankdir=\"LR\";\n";
// standalone // First Step : Create all HW interface:
for (size_t iii=0; iii<m_list.size(); ++iii) { {
std11::shared_ptr<river::io::Node> val = m_list[iii].lock(); // standalone
if (val != nullptr) { for (size_t iii=0; iii<m_list.size(); ++iii) {
val->generateDot(node); std11::shared_ptr<river::io::Node> val = m_list[iii].lock();
if (val != nullptr) {
if (val->isHarwareNode() == true) {
val->generateDot(node);
}
}
}
for (std::map<std::string, std11::shared_ptr<river::io::Group> >::iterator it(m_listGroup.begin());
it != m_listGroup.end();
++it) {
if (it->second != nullptr) {
it->second->generateDot(node, true);
}
} }
} }
for (std::map<std::string, std11::shared_ptr<river::io::Group> >::iterator it(m_listGroup.begin()); // All other ...
it != m_listGroup.end(); {
++it) { // standalone
if (it->second != nullptr) { for (size_t iii=0; iii<m_list.size(); ++iii) {
it->second->generateDot(node); std11::shared_ptr<river::io::Node> val = m_list[iii].lock();
if (val != nullptr) {
if (val->isHarwareNode() == false) {
val->generateDot(node);
}
}
}
for (std::map<std::string, std11::shared_ptr<river::io::Group> >::iterator it(m_listGroup.begin());
it != m_listGroup.end();
++it) {
if (it->second != nullptr) {
it->second->generateDot(node, false);
}
} }
} }
node << "}" << "\n"; node << "}" << "\n";
node.fileClose(); node.fileClose();
RIVER_INFO("Generate the DOT files: " << node << " (DONE)"); RIVER_INFO("Generate the DOT files: " << node << " (DONE)");

74
river/io/Node.cpp
View File

@ -254,53 +254,61 @@ int32_t river::io::Node::newOutput(void* _outputBuffer,
static void link(etk::FSNode& _node, const std::string& _first, const std::string& _op, const std::string& _second) { static void link(etk::FSNode& _node, const std::string& _first, const std::string& _op, const std::string& _second) {
if (_op == "->") { if (_op == "->") {
_node << " " << _first << " -> " << _second << ";\n"; _node << " " << _first << " -> " << _second << ";\n";
} else if (_op == "<-") { } else if (_op == "<-") {
_node << " " << _first << " -> " <<_second<< " [color=transparent];\n"; _node << " " << _first << " -> " <<_second<< " [color=transparent];\n";
_node << " " << _second << " -> " << _first << " [constraint=false];\n"; _node << " " << _second << " -> " << _first << " [constraint=false];\n";
} }
} }
void river::io::Node::generateDot(etk::FSNode& _node) { void river::io::Node::generateDot(etk::FSNode& _node) {
_node << "subgraph clusterNode_" << m_uid << " {\n"; _node << " subgraph clusterNode_" << m_uid << " {\n";
_node << " color=blue;\n"; _node << " color=blue;\n";
_node << " label=\"[" << m_uid << "] IO::Node : " << m_name << "\";\n"; _node << " label=\"[" << m_uid << "] IO::Node : " << m_name << "\";\n";
if (m_isInput == true) { if (m_isInput == true) {
_node << " node [shape=rarrow];\n"; _node << " node [shape=rarrow];\n";
_node << " NODE_" << m_uid << "_HW_interface [ label=\"HW interface\n interface=ALSA\n stream=MICROPHONE\n type=input\" ];\n"; _node << " NODE_" << m_uid << "_HW_interface [ label=\"HW interface\\n interface=ALSA\\n stream=" << m_name << "\\n type=input\" ];\n";
_node << " subgraph clusterNode_" << m_uid << "_process {\n"; _node << " subgraph clusterNode_" << m_uid << "_process {\n";
_node << " label=\"Drain::Process\";\n"; _node << " label=\"Drain::Process\";\n";
_node << " node [shape=ellipse];\n"; _node << " node [shape=ellipse];\n";
_node << " node_ALGO_" << m_uid << "_in [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\" ];\n"; _node << " node_ALGO_" << m_uid << "_in [ label=\"format=" << etk::to_string(m_process.getInputConfig().getFormat())
_node << " node_ALGO_" << m_uid << "_out [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\" ];\n"; << "\\n freq=" << m_process.getInputConfig().getFrequency()
<< "\\n channelMap=" << etk::to_string(m_process.getInputConfig().getMap()) << "\" ];\n";
_node << " node_ALGO_" << m_uid << "_out [ label=\"format=" << etk::to_string(m_process.getOutputConfig().getFormat())
<< "\\n freq=" << m_process.getOutputConfig().getFrequency()
<< "\\n channelMap=" << etk::to_string(m_process.getOutputConfig().getMap()) << "\" ];\n";
_node << " }\n"; _node << " }\n";
_node << " node [shape=square];\n"; _node << " node [shape=square];\n";
_node << " NODE_" << m_uid << "_demuxer [ label=\"DEMUXER\n format=xxx\" ];\n"; _node << " NODE_" << m_uid << "_demuxer [ label=\"DEMUXER\\n format=" << etk::to_string(m_process.getOutputConfig().getFormat()) << "\" ];\n";
// Link all nodes : // Link all nodes :
_node << " NODE_" << m_uid << "_HW_interface -> node_ALGO_" << m_uid << "_in [arrowhead=\"open\"];\n"; _node << " NODE_" << m_uid << "_HW_interface -> node_ALGO_" << m_uid << "_in [arrowhead=\"open\"];\n";
_node << " node_ALGO_" << m_uid << "_in -> node_ALGO_" << m_uid << "_out [arrowhead=\"open\"];\n"; _node << " node_ALGO_" << m_uid << "_in -> node_ALGO_" << m_uid << "_out [arrowhead=\"open\"];\n";
_node << " node_ALGO_" << m_uid << "_out -> NODE_" << m_uid << "_demuxer [arrowhead=\"open\"];\n"; _node << " node_ALGO_" << m_uid << "_out -> NODE_" << m_uid << "_demuxer [arrowhead=\"open\"];\n";
} else { } else {
size_t nbOutput = getNumberOfInterfaceAvaillable(river::modeInterface_output); size_t nbOutput = getNumberOfInterfaceAvaillable(river::modeInterface_output);
size_t nbfeedback = getNumberOfInterfaceAvaillable(river::modeInterface_feedback); size_t nbfeedback = getNumberOfInterfaceAvaillable(river::modeInterface_feedback);
_node << " node [shape=larrow];\n"; _node << " node [shape=larrow];\n";
_node << " NODE_" << m_uid << "_HW_interface [ label=\"HW interface\n interface=ALSA\n stream=SPEAKER\n type=output\" ];\n"; _node << " NODE_" << m_uid << "_HW_interface [ label=\"HW interface\\n interface=ALSA\\n stream=" << m_name << "\\n type=output\" ];\n";
if (nbOutput>0) { if (nbOutput>0) {
_node << " subgraph clusterNode_" << m_uid << "_process {\n"; _node << " subgraph clusterNode_" << m_uid << "_process {\n";
_node << " label=\"Drain::Process\";\n"; _node << " label=\"Drain::Process\";\n";
_node << " node [shape=ellipse];\n"; _node << " node [shape=ellipse];\n";
_node << " node_ALGO_" << m_uid << "_out [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\" ];\n"; _node << " node_ALGO_" << m_uid << "_out [ label=\"format=" << etk::to_string(m_process.getOutputConfig().getFormat())
_node << " node_ALGO_" << m_uid << "_in [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\" ];\n"; << "\\n freq=" << m_process.getOutputConfig().getFrequency()
_node << " }\n"; << "\\n channelMap=" << etk::to_string(m_process.getOutputConfig().getMap()) << "\" ];\n";
_node << " node_ALGO_" << m_uid << "_in [ label=\"format=" << etk::to_string(m_process.getInputConfig().getFormat())
<< "\\n freq=" << m_process.getInputConfig().getFrequency()
<< "\\n channelMap=" << etk::to_string(m_process.getInputConfig().getMap()) << "\" ];\n";
_node << " }\n";
} }
_node << " node [shape=square];\n"; _node << " node [shape=square];\n";
if (nbOutput>0) { if (nbOutput>0) {
_node << " NODE_" << m_uid << "_muxer [ label=\"MUXER\n format=xxx\" ];\n"; _node << " NODE_" << m_uid << "_muxer [ label=\"MUXER\\n format=" << etk::to_string(m_process.getInputConfig().getFormat()) << "\" ];\n";
} }
if (nbfeedback>0) { if (nbfeedback>0) {
_node << " NODE_" << m_uid << "_demuxer [ label=\"DEMUXER\n format=xxx\" ];\n"; _node << " NODE_" << m_uid << "_demuxer [ label=\"DEMUXER\\n format=" << etk::to_string(m_process.getOutputConfig().getFormat()) << "\" ];\n";
} }
// Link all nodes : // Link all nodes :
if (nbOutput>0) { if (nbOutput>0) {
@ -309,15 +317,15 @@ void river::io::Node::generateDot(etk::FSNode& _node) {
link(_node, "node_ALGO_" + etk::to_string(m_uid) + "_in", "<-", "NODE_" + etk::to_string(m_uid) + "_muxer"); link(_node, "node_ALGO_" + etk::to_string(m_uid) + "_in", "<-", "NODE_" + etk::to_string(m_uid) + "_muxer");
} }
if (nbfeedback>0) { if (nbfeedback>0) {
_node << " NODE_" << m_uid << "_HW_interface -> NODE_" << m_uid << "_demuxer [arrowhead=\"open\"];\n"; _node << " NODE_" << m_uid << "_HW_interface -> NODE_" << m_uid << "_demuxer [arrowhead=\"open\"];\n";
} }
if ( nbOutput>0 if ( nbOutput>0
&& nbfeedback>0) { && nbfeedback>0) {
_node << " { rank=same; NODE_" << m_uid << "_demuxer; NODE_" << m_uid << "_muxer }\n"; _node << " { rank=same; NODE_" << m_uid << "_demuxer; NODE_" << m_uid << "_muxer }\n";
} }
} }
_node << "}\n"; _node << " }\n \n";
for (size_t iii=0; iii< m_listAvaillable.size(); ++iii) { for (size_t iii=0; iii< m_listAvaillable.size(); ++iii) {
if (m_listAvaillable[iii].expired() == true) { if (m_listAvaillable[iii].expired() == true) {

4
river/io/Node.h
View File

@ -41,7 +41,9 @@ namespace river {
* @brief Destructor * @brief Destructor
*/ */
virtual ~Node(); virtual ~Node();
virtual bool isHarwareNode() {
return false;
};
protected: protected:
mutable std11::mutex m_mutex; mutable std11::mutex m_mutex;
std11::shared_ptr<const ejson::Object> m_config; std11::shared_ptr<const ejson::Object> m_config;

50
river/io/NodeAEC.cpp
View File

@ -345,33 +345,37 @@ void river::io::NodeAEC::processAEC(void* _dataMic, void* _dataFB, uint32_t _nbC
void river::io::NodeAEC::generateDot(etk::FSNode& _node) { void river::io::NodeAEC::generateDot(etk::FSNode& _node) {
_node << "subgraph clusterNode_" << m_uid << " {\n"; _node << " subgraph clusterNode_" << m_uid << " {\n";
_node << " color=blue;\n"; _node << " color=blue;\n";
_node << " label=\"[" << m_uid << "] IO::Node : " << m_name << "\";\n"; _node << " label=\"[" << m_uid << "] IO::Node : " << m_name << "\";\n";
_node << " node [shape=box];\n"; _node << " node [shape=box];\n";
// TODO : Create a structure ... // TODO : Create a structure ...
_node << " NODE_" << m_uid << "_HW_AEC [ label=\"AEC\" ];\n"; _node << " NODE_" << m_uid << "_HW_AEC [ label=\"AEC\" ];\n";
_node << " subgraph clusterNode_" << m_uid << "_process {\n"; _node << " subgraph clusterNode_" << m_uid << "_process {\n";
_node << " label=\"Drain::Process\";\n"; _node << " label=\"Drain::Process\";\n";
_node << " node [shape=ellipse];\n"; _node << " node [shape=ellipse];\n";
_node << " node_ALGO_" << m_uid << "_in [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\" ];\n"; _node << " node_ALGO_" << m_uid << "_in [ label=\"format=" << etk::to_string(m_process.getInputConfig().getFormat())
_node << " node_ALGO_" << m_uid << "_out [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\" ];\n"; << "\\n freq=" << m_process.getInputConfig().getFrequency()
<< "\\n channelMap=" << etk::to_string(m_process.getInputConfig().getMap()) << "\" ];\n";
_node << " node_ALGO_" << m_uid << "_out [ label=\"format=" << etk::to_string(m_process.getOutputConfig().getFormat())
<< "\\n freq=" << m_process.getOutputConfig().getFrequency()
<< "\\n channelMap=" << etk::to_string(m_process.getOutputConfig().getMap()) << "\" ];\n";
_node << " }\n"; _node << " }\n";
_node << " node [shape=square];\n"; _node << " node [shape=square];\n";
_node << " NODE_" << m_uid << "_demuxer [ label=\"DEMUXER\n format=xxx\" ];\n"; _node << " NODE_" << m_uid << "_demuxer [ label=\"DEMUXER\\n format=" << etk::to_string(m_process.getOutputConfig().getFormat()) << "\" ];\n";
// Link all nodes : // Link all nodes :
_node << " NODE_" << m_uid << "_HW_AEC -> node_ALGO_" << m_uid << "_in;\n"; _node << " NODE_" << m_uid << "_HW_AEC -> node_ALGO_" << m_uid << "_in;\n";
_node << " node_ALGO_" << m_uid << "_in -> node_ALGO_" << m_uid << "_out;\n"; _node << " node_ALGO_" << m_uid << "_in -> node_ALGO_" << m_uid << "_out;\n";
_node << " node_ALGO_" << m_uid << "_out -> NODE_" << m_uid << "_demuxer;\n"; _node << " node_ALGO_" << m_uid << "_out -> NODE_" << m_uid << "_demuxer;\n";
_node << "}\n"; _node << " }\n";
if (m_interfaceMicrophone != nullptr) { if (m_interfaceMicrophone != nullptr) {
_node << " API_" << m_interfaceMicrophone->m_uid << "_input -> NODE_" << m_uid << "_HW_AEC;\n"; _node << " " << m_interfaceMicrophone->getDotNodeName() << " -> NODE_" << m_uid << "_HW_AEC;\n";
} }
if (m_interfaceFeedBack != nullptr) { if (m_interfaceFeedBack != nullptr) {
_node << " API_" << m_interfaceFeedBack->m_uid << "_feedback -> NODE_" << m_uid << "_HW_AEC;\n"; _node << " " << m_interfaceFeedBack->getDotNodeName() << " -> NODE_" << m_uid << "_HW_AEC;\n";
} }
for (size_t iii=0; iii<m_list.size(); ++iii) { for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) { if (m_list[iii] != nullptr) {

3
river/io/NodeAirTAudio.h
View File

@ -28,6 +28,9 @@ namespace river {
* @brief Destructor * @brief Destructor
*/ */
virtual ~NodeAirTAudio(); virtual ~NodeAirTAudio();
virtual bool isHarwareNode() {
return true;
};
protected: protected:
airtaudio::Interface m_adac; //!< Real audio interface airtaudio::Interface m_adac; //!< Real audio interface
airtaudio::DeviceInfo m_info; airtaudio::DeviceInfo m_info;

71
river/io/NodeMuxer.cpp
View File

@ -128,7 +128,7 @@ river::io::NodeMuxer::NodeMuxer(const std::string& _name, const std11::shared_pt
} }
// set callback mode ... // set callback mode ...
m_interfaceInput1->setInputCallback(std11::bind(&river::io::NodeMuxer::onDataReceivedFeedBack, m_interfaceInput1->setInputCallback(std11::bind(&river::io::NodeMuxer::onDataReceivedInput1,
this, this,
std11::placeholders::_1, std11::placeholders::_1,
std11::placeholders::_2, std11::placeholders::_2,
@ -137,7 +137,7 @@ river::io::NodeMuxer::NodeMuxer(const std::string& _name, const std11::shared_pt
std11::placeholders::_5, std11::placeholders::_5,
std11::placeholders::_6)); std11::placeholders::_6));
// set callback mode ... // set callback mode ...
m_interfaceInput2->setInputCallback(std11::bind(&river::io::NodeMuxer::onDataReceivedMicrophone, m_interfaceInput2->setInputCallback(std11::bind(&river::io::NodeMuxer::onDataReceivedInput2,
this, this,
std11::placeholders::_1, std11::placeholders::_1,
std11::placeholders::_2, std11::placeholders::_2,
@ -187,12 +187,12 @@ void river::io::NodeMuxer::stop() {
} }
void river::io::NodeMuxer::onDataReceivedMicrophone(const void* _data, void river::io::NodeMuxer::onDataReceivedInput1(const void* _data,
const std11::chrono::system_clock::time_point& _time, const std11::chrono::system_clock::time_point& _time,
size_t _nbChunk, size_t _nbChunk,
enum audio::format _format, enum audio::format _format,
uint32_t _frequency, uint32_t _frequency,
const std::vector<audio::channel>& _map) { const std::vector<audio::channel>& _map) {
RIVER_DEBUG("Microphone Time=" << _time << " _nbChunk=" << _nbChunk << " _map=" << _map << " _format=" << _format << " freq=" << _frequency); RIVER_DEBUG("Microphone Time=" << _time << " _nbChunk=" << _nbChunk << " _map=" << _map << " _format=" << _format << " freq=" << _frequency);
RIVER_DEBUG(" next=" << _time + std11::chrono::nanoseconds(_nbChunk*1000000000LL/int64_t(_frequency)) ); RIVER_DEBUG(" next=" << _time + std11::chrono::nanoseconds(_nbChunk*1000000000LL/int64_t(_frequency)) );
if (_format != audio::format_int16) { if (_format != audio::format_int16) {
@ -205,7 +205,7 @@ void river::io::NodeMuxer::onDataReceivedMicrophone(const void* _data,
process(); process();
} }
void river::io::NodeMuxer::onDataReceivedFeedBack(const void* _data, void river::io::NodeMuxer::onDataReceivedInput2(const void* _data,
const std11::chrono::system_clock::time_point& _time, const std11::chrono::system_clock::time_point& _time,
size_t _nbChunk, size_t _nbChunk,
enum audio::format _format, enum audio::format _format,
@ -430,34 +430,38 @@ void river::io::NodeMuxer::processMuxer(void* _dataIn1, void* _dataIn2, uint32_t
void river::io::NodeMuxer::generateDot(etk::FSNode& _node) { void river::io::NodeMuxer::generateDot(etk::FSNode& _node) {
_node << "subgraph clusterNode_" << m_uid << " {\n"; _node << " subgraph clusterNode_" << m_uid << " {\n";
_node << " color=blue;\n"; _node << " color=blue;\n";
_node << " label=\"[" << m_uid << "] IO::Node : " << m_name << "\";\n"; _node << " label=\"[" << m_uid << "] IO::Node : " << m_name << "\";\n";
_node << " node [shape=box];\n"; _node << " node [shape=box];\n";
// TODO : Create a structure ... // TODO : Create a structure ...
_node << " NODE_" << m_uid << "_HW_AEC [ label=\"AEC\" ];\n"; _node << " NODE_" << m_uid << "_HW_MUXER [ label=\"Muxer\\n channelMap=" << etk::to_string(getInterfaceFormat().getMap()) << "\" ];\n";
_node << " subgraph clusterNode_" << m_uid << "_process {\n"; _node << " subgraph clusterNode_" << m_uid << "_process {\n";
_node << " label=\"Drain::Process\";\n"; _node << " label=\"Drain::Process\";\n";
_node << " node [shape=ellipse];\n"; _node << " node [shape=ellipse];\n";
_node << " node_ALGO_" << m_uid << "_in [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\" ];\n"; _node << " node_ALGO_" << m_uid << "_in [ label=\"format=" << etk::to_string(m_process.getInputConfig().getFormat())
_node << " node_ALGO_" << m_uid << "_out [ label=\"format=xxx\n freq=yyy\n channelMap={left,right}\" ];\n"; << "\\n freq=" << m_process.getInputConfig().getFrequency()
<< "\\n channelMap=" << etk::to_string(m_process.getInputConfig().getMap()) << "\" ];\n";
_node << " node_ALGO_" << m_uid << "_out [ label=\"format=" << etk::to_string(m_process.getOutputConfig().getFormat())
<< "\\n freq=" << m_process.getOutputConfig().getFrequency()
<< "\\n channelMap=" << etk::to_string(m_process.getOutputConfig().getMap()) << "\" ];\n";
_node << " }\n"; _node << " }\n";
_node << " node [shape=square];\n"; _node << " node [shape=square];\n";
_node << " NODE_" << m_uid << "_demuxer [ label=\"DEMUXER\n format=xxx\" ];\n"; _node << " NODE_" << m_uid << "_demuxer [ label=\"DEMUXER\\n format=" << etk::to_string(m_process.getOutputConfig().getFormat()) << "\" ];\n";
// Link all nodes : // Link all nodes :
_node << " NODE_" << m_uid << "_HW_AEC -> node_ALGO_" << m_uid << "_in;\n"; _node << " NODE_" << m_uid << "_HW_MUXER -> node_ALGO_" << m_uid << "_in;\n";
_node << " node_ALGO_" << m_uid << "_in -> node_ALGO_" << m_uid << "_out;\n"; _node << " node_ALGO_" << m_uid << "_in -> node_ALGO_" << m_uid << "_out;\n";
_node << " node_ALGO_" << m_uid << "_out -> NODE_" << m_uid << "_demuxer;\n"; _node << " node_ALGO_" << m_uid << "_out -> NODE_" << m_uid << "_demuxer;\n";
_node << "}\n"; _node << " }\n";
if (m_interfaceInput2 != nullptr) { if (m_interfaceInput2 != nullptr) {
_node << " API_" << m_interfaceInput2->m_uid << "_input -> NODE_" << m_uid << "_HW_AEC;\n"; _node << " " << m_interfaceInput2->getDotNodeName() << " -> NODE_" << m_uid << "_HW_MUXER;\n";
} }
if (m_interfaceInput1 != nullptr) { if (m_interfaceInput1 != nullptr) {
_node << " API_" << m_interfaceInput1->m_uid << "_feedback -> NODE_" << m_uid << "_HW_AEC;\n"; _node << " " << m_interfaceInput1->getDotNodeName() << " -> NODE_" << m_uid << "_HW_MUXER;\n";
} }
_node << " \n";
for (size_t iii=0; iii<m_list.size(); ++iii) { for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) { if (m_list[iii] != nullptr) {
if (m_list[iii]->getMode() == modeInterface_input) { if (m_list[iii]->getMode() == modeInterface_input) {
@ -471,4 +475,5 @@ void river::io::NodeMuxer::generateDot(etk::FSNode& _node) {
} }
} }
} }
_node << "\n";
} }

24
river/io/NodeMuxer.h
View File

@ -36,18 +36,18 @@ namespace river {
audio::format _format, audio::format _format,
const std::string& _streamName, const std::string& _streamName,
const std::string& _name); const std::string& _name);
void onDataReceivedMicrophone(const void* _data, void onDataReceivedInput1(const void* _data,
const std11::chrono::system_clock::time_point& _time, const std11::chrono::system_clock::time_point& _time,
size_t _nbChunk, size_t _nbChunk,
enum audio::format _format, enum audio::format _format,
uint32_t _frequency, uint32_t _frequency,
const std::vector<audio::channel>& _map); const std::vector<audio::channel>& _map);
void onDataReceivedFeedBack(const void* _data, void onDataReceivedInput2(const void* _data,
const std11::chrono::system_clock::time_point& _time, const std11::chrono::system_clock::time_point& _time,
size_t _nbChunk, size_t _nbChunk,
enum audio::format _format, enum audio::format _format,
uint32_t _frequency, uint32_t _frequency,
const std::vector<audio::channel>& _map); const std::vector<audio::channel>& _map);
std::vector<audio::channel> m_mapInput1; std::vector<audio::channel> m_mapInput1;
std::vector<audio::channel> m_mapInput2; std::vector<audio::channel> m_mapInput2;
river::CircularBuffer m_bufferInput1; river::CircularBuffer m_bufferInput1;

3
river/io/NodePortAudio.h
View File

@ -28,6 +28,9 @@ namespace river {
* @brief Destructor * @brief Destructor
*/ */
virtual ~NodePortAudio(); virtual ~NodePortAudio();
virtual bool isHarwareNode() {
return true;
};
protected: protected:
PaStream* m_stream; PaStream* m_stream;
public: public: