oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renderer: switched audio rendering over to planar buffers

Browse Source 
While planar audio cannot be used for playback, it's much easier for processing.
This should lead to cleaner and easier to write code in the future.
This commit is contained in:
itsmattkc
2020-03-31 18:01:20 +11:00
parent 8413886c17
commit 6f0d72c05d
30 changed files with 436 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/audio/pan/pan.cpp
+8 -12
View File
@@ -47,7 +47,7 @@ NodeInput *PanNode::ProcessesSamplesFrom() const
return samples_input_;
}
void PanNode::ProcessSamples(const NodeValueDatabase *values, const AudioRenderingParams &params, const float *input, float *output, int index) const
void PanNode::ProcessSamples(const NodeValueDatabase *values, const AudioRenderingParams &params, const SampleBufferPtr input, SampleBufferPtr output, int index) const
{
if (params.channel_count() != 2) {
// This node currently only works for stereo audio
@@ -56,18 +56,14 @@ void PanNode::ProcessSamples(const NodeValueDatabase *values, const AudioRenderi
float pan_val = (*values)[panning_input_].Get(NodeParam::kFloat).toFloat();
output[index] = input[index];
for (int i=0;i<params.channel_count();i++) {
output->data()[i][index] = input->data()[i][index];
}
if (index%2 == 0) {
// Sample is left channel
if (pan_val > 0) {
output[index] *= (1.0F - pan_val);
}
} else {
// Sample is right channel
if (pan_val < 0) {
output[index] *= (1.0F - qAbs(pan_val));
}
if (pan_val > 0) {
output->data()[0][index] *= (1.0F - pan_val);
} else if (pan_val < 0) {
output->data()[1][index] *= (1.0F - qAbs(pan_val));
}
}
app/node/audio/pan/pan.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
virtual Capabilities GetCapabilities(const NodeValueDatabase&) const override;
virtual NodeInput* ProcessesSamplesFrom() const override;
virtual void ProcessSamples(const NodeValueDatabase* values, const AudioRenderingParams& params, const float* input, float* output, int index) const override;
virtual void ProcessSamples(const NodeValueDatabase* values, const AudioRenderingParams& params, const SampleBufferPtr input, SampleBufferPtr output, int index) const override;
virtual void Retranslate() override;
app/node/audio/volume/volume.cpp
+4 -2
View File
@@ -46,11 +46,13 @@ NodeInput *VolumeNode::ProcessesSamplesFrom() const
return samples_input_;
}
void VolumeNode::ProcessSamples(const NodeValueDatabase *values, const AudioRenderingParams& params, const float* input, float* output, int index) const
void VolumeNode::ProcessSamples(const NodeValueDatabase *values, const AudioRenderingParams& params, const SampleBufferPtr input, SampleBufferPtr output, int index) const
{
float volume_val = (*values)[volume_input_].Get(NodeParam::kFloat).toFloat();
output[index] = input[index] * volume_val;
for (int i=0;i<params.channel_count();i++) {
output->data()[i][index] = input->data()[i][index] * volume_val;
}
}
void VolumeNode::Retranslate()
app/node/audio/volume/volume.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
virtual Capabilities GetCapabilities(const NodeValueDatabase&) const override;
virtual NodeInput* ProcessesSamplesFrom() const override;
virtual void ProcessSamples(const NodeValueDatabase* values, const AudioRenderingParams& params, const float* input, float* output, int index) const override;
virtual void ProcessSamples(const NodeValueDatabase* values, const AudioRenderingParams& params, const SampleBufferPtr input, SampleBufferPtr output, int index) const override;
virtual void Retranslate() override;
app/node/node.cpp
+1 -6
View File
@@ -482,13 +482,8 @@ NodeInput* Node::ProcessesSamplesFrom() const
return nullptr;
}
void Node::ProcessSamples(const NodeValueDatabase *values, const AudioRenderingParams &params, const float *input, float *output, int index) const
void Node::ProcessSamples(const NodeValueDatabase*, const AudioRenderingParams&, const SampleBufferPtr, SampleBufferPtr, int) const
{
Q_UNUSED(values)
Q_UNUSED(params)
Q_UNUSED(input)
Q_UNUSED(output)
Q_UNUSED(index)
}
NodeParam *Node::GetParameterWithID(const QString &id) const
app/node/node.h
+2 -1
View File
@@ -26,6 +26,7 @@
#include <QPointF>
#include <QXmlStreamWriter>
#include "codec/samplebuffer.h"
#include "common/rational.h"
#include "common/xmlutils.h"
#include "node/dependency.h"
@@ -190,7 +191,7 @@ public:
/**
* @brief If ProcessesSamples() is true, this is the function that will process them.
*/
virtual void ProcessSamples(const NodeValueDatabase *values, const AudioRenderingParams& params, const float* input, float* output, int index) const;
virtual void ProcessSamples(const NodeValueDatabase *values, const AudioRenderingParams& params, const SampleBufferPtr input, SampleBufferPtr output, int index) const;
/**
* @brief Returns the parameter with the specified ID (or nullptr if it doesn't exist)
app/node/param.h
+1 -1
View File
@@ -137,7 +137,7 @@ public:
/**
* Audio samples type
*
* Resolves to `QVector4D`.
* Resolves to `SampleBufferPtr`.
*/
kSamples = 0x400,