Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve mixer performance when gain is 0.0 #466

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Improve mixer performance when gain is 0.0 #466

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
22329a3
Merge branch 'master' of https://github.com/h4yn0nnym0u5e/Audio
h4yn0nnym0u5e Jun 23, 2023
314d369
Merge branch 'master' of https://github.com/h4yn0nnym0u5e/Audio
h4yn0nnym0u5e Jun 28, 2023
72a36b3
Merge branch 'master' of https://github.com/h4yn0nnym0u5e/Audio
h4yn0nnym0u5e Aug 2, 2023
4e79ba8
Merge branch 'master' of https://github.com/h4yn0nnym0u5e/Audio
h4yn0nnym0u5e Aug 15, 2023
6faf8c1
Improve mixer performance when gain is 0.0
h4yn0nnym0u5e Aug 15, 2023
5f3bef6
Remove debug code
h4yn0nnym0u5e Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions mixer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,33 @@ void AudioMixer4::update(void)
audio_block_t *in, *out=NULL;
unsigned int channel;

for (channel=0; channel < 4; channel++) {
if (!out) {
for (channel=0; channel < 4; channel++)
{
if (nullptr == out) // no audio so far
{
out = receiveWritable(channel);
if (out) {
if (out) // first audio received
{
int32_t mult = multiplier[channel];
if (mult != MULTI_UNITYGAIN) applyGain(out->data, mult);
if (0 == mult) // would be zeroed, just ignore it
{
release(out);
out = nullptr;
}
else
{
if (mult != MULTI_UNITYGAIN)
applyGain(out->data, mult);
}
}
} else {
}
else // we have something to transmit already: add to it
{
in = receiveReadOnly(channel);
if (in) {
applyGainThenAdd(out->data, in->data, multiplier[channel]);
if (in)
{
if (0 != multiplier[channel]) // only apply non-zero gain!
applyGainThenAdd(out->data, in->data, multiplier[channel]);
release(in);
}
}
Expand Down